summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2012-12-16 18:11:10 -0800
committerTingPing <tingping@tingping.se>2012-12-16 18:11:10 -0800
commit49f268d71ec235cd7659c53511440a6ebe6f98b7 (patch)
treedd40a879d2e78fc65e9c11e7fc63862fdc81b809
parentc6d955ade738815ec119ae76db32a3fcc1ac5d72 (diff)
parentdf9a05cba5e6a0caf27488006aea0b2eda3de050 (diff)
Merge pull request #328 from RichardHitt/master
install hicolor svg; reorganize some Makefile.am files
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac3
-rw-r--r--share/Makefile.am1
-rw-r--r--share/icons/Makefile.am13
-rw-r--r--share/misc/Makefile.am3
5 files changed, 21 insertions, 7 deletions
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..ee5384cc
--- /dev/null
+++ b/share/icons/Makefile.am
@@ -0,0 +1,13 @@
+icon_DATA = ../../src/pixmaps/hexchat.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+
+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
+