icon install

4 files changed, 15 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index d9c259ee..8f58d3ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,8 @@ src/plugins/daemon/Makefile
 src/plugins/fs/Makefile
 src/plugins/peers/Makefile
 src/plugins/stats/Makefile
+pixmaps/Makefile
+pixmaps/icons/Makefile
 po/Makefile.in
 po/Makefile
 gnunet-gtk.desktop
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
new file mode 100644
index 00000000..06511861
--- /dev/null
+++ b/pixmaps/Makefile.am
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = icons 
diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am
index 5075a644..2e3329ac 100644
--- a/pixmaps/icons/Makefile.am
+++ b/pixmaps/icons/Makefile.am
@@ -7,14 +7,13 @@ theme_icons = \
  apps,gnunet-gtk-24.png \
  apps,gnunet-gtk-32.png
 
-install_icon_exec = $(top_srcdir)/pixmaps/icons/icon-theme-installer -t 
-$(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m 
-"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
+install_icon_exec=${top_srcdir}/pixmaps/icons/icon-theme-installer -t ${theme} -s ${srcdir} -b ${themedir} -m "${mkinstalldirs}" -x "${INSTALL_DATA}"
+
 install-data-local:
-        $(install_icon_exec) -i $(theme_icons)
+        $(install_icon_exec) -i "${theme_icons}"
 
 uninstall-hook:
-        $(install_icon_exec) -u $(theme_icons)
+        $(install_icon_exec) -u "${theme_icons}"
 
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = $(wildcard *.svg *.png)
diff --git a/pixmaps/icons/icon-theme-installer b/pixmaps/icons/icon-theme-installer
index b1c93f59..c166fa6d 100755
--- a/pixmaps/icons/icon-theme-installer
+++ b/pixmaps/icons/icon-theme-installer
@@ -30,7 +30,7 @@
 #   music-player-banshee-16.png
 #
 # The <SIZE> here is -16 and will expand to 16x16 per the icon theme 
-spec
+# spec
 #
 # What follows is an example Makefile.am for icon theme installation:
 #
@@ -45,8 +45,8 @@ spec
 #       apps,music-player-banshee-32.png
 #
 # install_icon_exec = $(top_srcdir)/build/icon-theme-installer -t 
-$(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m 
-"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
+# $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m 
+#"$(mkinstalldirs)" -x "$(INSTALL_DATA)"
 # install-data-local:
 #       $(install_icon_exec) -i $(theme_icons)
 #
@@ -63,15 +63,14 @@ $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m
 # -u         : Uninstall
 # -t <theme> : Theme name (hicolor)
 # -b <dir>   : Theme installation dest directory [x$(DESTDIR)] - Always 
-prefix
+#              prefix
 #              this argument with x; it will be stripped but will act as 
-a
 #              placeholder for zero $DESTDIRs (only set by packagers)
 # -d <dir>   : Theme installation directory [$(hicolordir)]
 # -s <dir>   : Source directory [$(srcdir)]
 # -m <exec>  : Command to exec for directory creation [$(mkinstalldirs)]
 # -x <exec>  : Command to exec for single file installation 
-[$(INSTALL_DATA)]
+#             [$(INSTALL_DATA)]
 # <remainging> : All remainging should be category,filename pairs
 
 while getopts "iut:b:d:s:m:x:" flag; do
@@ -149,8 +148,7 @@ icon theme"
                         exit 1
                 }
                 
-                $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path) 
-|| {
+                $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path) || {
                         echo "Failed to install $SRC_DIR/$build_name 
 into $install_path"
                         exit 1