[GRASS-SVN] r63417 - grass/trunk/include/Make

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Dec 7 04:11:31 PST 2014


Author: martinl
Date: 2014-12-07 04:11:31 -0800 (Sun, 07 Dec 2014)
New Revision: 63417

Modified:
   grass/trunk/include/Make/Script.make
Log:
fix bogus in r63416


Modified: grass/trunk/include/Make/Script.make
===================================================================
--- grass/trunk/include/Make/Script.make	2014-12-07 11:57:46 UTC (rev 63416)
+++ grass/trunk/include/Make/Script.make	2014-12-07 12:11:31 UTC (rev 63417)
@@ -34,8 +34,10 @@
 install:
 	$(INSTALL) $(SCRIPT) $(INST_DIR)/scripts/
 	$(INSTALL_DATA) $(HTMLDIR)/$(PGM).html $(INST_DIR)/docs/html/
-	$(INSTALL_DATA) $(HTMLDIR)/*.png $(INST_DIR)/docs/html/
-	$(INSTALL_DATA) $(HTMLDIR)/*.jpg $(INST_DIR)/docs/html/
+	$(eval IMG := $(wildcard $(HTMLDIR)/*.png) $(wildcard $(HTMLDIR)/*.jpg))
+	if [ -n "$(IMG)" ] ; then \
+		$(INSTALL_DATA) $(IMG)  $(INST_DIR)/docs/html/ ; \
+	fi
 	$(INSTALL_DATA) $(ARCH_DISTDIR)/docs/man/man1/$(PGM).1 $(INST_DIR)/docs/man/man1/
 	if [ -d "$(ETC)/$(PGM)" ] ; then \
 		cp -rL $(ETC)/$(PGM) $(INST_DIR)/etc/ ; \



More information about the grass-commit mailing list