[commit-gajim] r8128 - in trunk/data: emoticons iconsets - Commits

4 May 2007

Author: asterix
Date: 2007-05-04 18:38:28 +0200 (Fri, 04 May 2007)
New Revision: 8128
Modified:
   trunk/data/emoticons/Makefile.am
   trunk/data/iconsets/Makefile.am
Log:
[Tobu] Fix a bug when srcdir != builddir
Modified: trunk/data/emoticons/Makefile.am
===================================================================

--- trunk/data/emoticons/Makefile.am	2007-05-03 21:43:03 UTC (rev 8127)
+++ trunk/data/emoticons/Makefile.am	2007-05-04 16:38:28 UTC (rev 8128)
@@ -8,28 +8,28 @@
install-data-local:
-	@for d in $(EMOTICONS_DIRS);do \
-		if test -d $$d;then \
+	@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
    		echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
    		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
    	fi; \
    done; \
-	for f in $(EMOTICONS_FILES);do \
-		if test -f $$f; then \
-			echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
+	for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
    	fi; \
    done;
dist-hook:
-	@for d in $(EMOTICONS_DIRS);do \
-		if test -d $$d;then \
+	@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
    		echo " $(mkdir_p) $(distdir)/$$d"; \
    		$(mkdir_p) $(distdir)/$$d || exit 1; \
    	fi; \
    done; \
-	for f in $(EMOTICONS_FILES);do \
-		if test -f $$f; then \
+	for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
+		if test -f $(srcdir)/$$f; then \
    		echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
    		cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
    	fi; \
Modified: trunk/data/iconsets/Makefile.am
===================================================================
--- trunk/data/iconsets/Makefile.am	2007-05-03 21:43:03 UTC (rev 8127)
+++ trunk/data/iconsets/Makefile.am	2007-05-04 16:38:28 UTC (rev 8128)
@@ -9,28 +9,28 @@
    		   transports/**/{16x16,32x32,48x48}/{*.gif,*.png}
install-data-local:
-	@for d in $(ICONSET_DIRS);do \
-		if test -d $$d;then \
+	@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
    		echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \
    		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \
    	fi; \
    done
-	for f in $(ICONSET_FILES);do \
-		if test -f $$f; then \
-			echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \
+	for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \
+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \
    	fi; \
    done;
dist-hook:
-	@for d in $(ICONSET_DIRS);do \
-		if test -d $$d;then \
+	@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
    		echo " $(mkdir_p) $(distdir)/$$d"; \
    		$(mkdir_p) $(distdir)/$$d || exit 1; \
    	fi; \
    done
-	for f in $(ICONSET_FILES);do \
-		if test -f $$f; then \
+	for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
+		if test -f $(srcdir)/$$f; then \
    		echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
    		cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
    	fi; \

    