[gnome-alsamixer] Fix dist'ing of the pixmaps



commit f04ccb3464b372ee8cee919e1bef40e4429aa181
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 26 14:04:18 2012 +0100

    Fix dist'ing of the pixmaps

 Makefile.am |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bf0e1cd..1f1aab9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,33 +2,21 @@
 
 SUBDIRS = po src
 
-EXTRA_DIST = autogen.sh gnome-alsamixer.schemas
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-alsamixer.schemas
 
+pixmapdir = $(datadir)/pixmaps/
+pixmap_DATA = pixmaps/gnome-alsamixer-icon.png
+
+EXTRA_DIST = autogen.sh gnome-alsamixer.schemas $(pixmap_DATA)
+
 install-data-local:
 	@$(NORMAL_INSTALL)
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
 	gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
-	if test -d $(srcdir)/pixmaps; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE); \
-	  for pixmap in $(srcdir)/pixmaps/*; do \
-	    if test -f $$pixmap; then \
-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE); \
-	    fi \
-	  done \
-	fi
 
 dist-hook:
-	if test -d pixmaps; then \
-	  mkdir $(distdir)/pixmaps; \
-	  for pixmap in pixmaps/*; do \
-	    if test -f $$pixmap; then \
-	      cp -p $$pixmap $(distdir)/pixmaps; \
-	    fi \
-	  done \
-	fi
 	for spec in *.spec; do \
 	  if test -f $$spec; then \
 	    cp -p $$spec $(distdir); \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]