From 925b45e8f0f3de9bf5072aad8240750c87cf03da Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Sun, 16 Dec 2012 17:29:08 -0800 Subject: Install hicolor svg; move the files Makefile.am to their subdirectories --- Makefile.am | 8 +------- configure.ac | 3 +++ share/Makefile.am | 1 + share/icons/Makefile.am | 13 +++++++++++++ share/misc/Makefile.am | 3 +++ 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 share/Makefile.am create mode 100644 share/icons/Makefile.am create mode 100644 share/misc/Makefile.am diff --git a/Makefile.am b/Makefile.am index 40ed64e9..91ca9d79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = po intl src plugins man +SUBDIRS = po intl src plugins man share EXTRA_DIST = autogen.sh -icon_DATA = src/pixmaps/hexchat.png -icondir = $(datadir)/pixmaps - -util_DATA = share/misc/hexchat.desktop -utildir = $(datadir)/applications - ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 66f698d3..5e129180 100644 --- a/configure.ac +++ b/configure.ac @@ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir) AC_OUTPUT([ Makefile +share/Makefile +share/icons/Makefile +share/misc/Makefile src/Makefile src/common/Makefile src/common/dbus/Makefile diff --git a/share/Makefile.am b/share/Makefile.am new file mode 100644 index 00000000..f265b88e --- /dev/null +++ b/share/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = icons misc diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am new file mode 100644 index 00000000..dadaa67d --- /dev/null +++ b/share/icons/Makefile.am @@ -0,0 +1,13 @@ +icon_DATA = ../../src/pixmaps/hexchat.png +icondir = $(datadir)/pixmaps + +hicolor_DATA = hexchat.svg +hicolordir = $(datadir)/icons/hicolor/scalable/apps + +UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + $(UPDATE_ICON_CACHE); + +uninstall-hook: + $(UPDATE_ICON_CACHE); diff --git a/share/misc/Makefile.am b/share/misc/Makefile.am new file mode 100644 index 00000000..eec37250 --- /dev/null +++ b/share/misc/Makefile.am @@ -0,0 +1,3 @@ +util_DATA = hexchat.desktop +utildir = $(datadir)/applications + -- cgit 1.4.1 From df9a05cba5e6a0caf27488006aea0b2eda3de050 Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Sun, 16 Dec 2012 18:05:37 -0800 Subject: Put hexchat png in icons/hicolor/48x48/apps --- share/icons/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am index dadaa67d..ee5384cc 100644 --- a/share/icons/Makefile.am +++ b/share/icons/Makefile.am @@ -1,5 +1,5 @@ icon_DATA = ../../src/pixmaps/hexchat.png -icondir = $(datadir)/pixmaps +icondir = $(datadir)/icons/hicolor/48x48/apps hicolor_DATA = hexchat.svg hicolordir = $(datadir)/icons/hicolor/scalable/apps -- cgit 1.4.1