[GRASS-SVN] r66417 - in grass-addons/grass7/gui/wxpython/wx.metadata: config profiles

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Oct 6 02:37:34 PDT 2015


Author: martinl
Date: 2015-10-06 02:37:34 -0700 (Tue, 06 Oct 2015)
New Revision: 66417

Modified:
   grass-addons/grass7/gui/wxpython/wx.metadata/config/Makefile
   grass-addons/grass7/gui/wxpython/wx.metadata/profiles/Makefile
Log:
wx.metadata: fix Makefile for config and profiles

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/config/Makefile
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/config/Makefile	2015-10-06 08:48:40 UTC (rev 66416)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/config/Makefile	2015-10-06 09:37:34 UTC (rev 66417)
@@ -4,10 +4,18 @@
 
 DSTDIR = $(ETC)/wx.metadata/config
 
+XMLFILES := $(patsubst %,$(DSTDIR)/%,$(wildcard *.xml))
+TXTFILES := $(patsubst %,$(DSTDIR)/%,$(wildcard *.txt))
+HTMLFILES := $(patsubst %,$(DSTDIR)/%,$(wildcard *.html))
+
+default: $(XMLFILES) $(TXTFILES) $(HTMLFILES) 
+
+install:
+	$(MKDIR) $(INST_DIR)/etc/wx.metadata/config
+	@cp -rL $(DSTDIR) $(INST_DIR)/etc/wx.metadata
+
 $(DSTDIR):
 	$(MKDIR) -p $@
 
-default:
-
-install: $(DSTDIR)
-	$(INSTALL_DATA) *.??? *.html $(DSTDIR)
\ No newline at end of file
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/profiles/Makefile
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/profiles/Makefile	2015-10-06 08:48:40 UTC (rev 66416)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/profiles/Makefile	2015-10-06 09:37:34 UTC (rev 66417)
@@ -4,10 +4,16 @@
 
 DSTDIR = $(ETC)/wx.metadata/profiles
 
+XMLFILES := $(patsubst %,$(DSTDIR)/%,$(wildcard *.xml))
+
+default: $(XMLFILES)
+
+install:
+	$(MKDIR) $(INST_DIR)/etc/wx.metadata/profiles
+	@cp -rL $(DSTDIR) $(INST_DIR)/etc/wx.metadata
+
 $(DSTDIR):
 	$(MKDIR) -p $@
 
-default:
-
-install: $(DSTDIR)
-	$(INSTALL_DATA) *.xml $(DSTDIR)
\ No newline at end of file
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@



More information about the grass-commit mailing list