[GRASS-SVN] r67845 - in grass-addons/grass7/raster/r.green: libgreen r.green.hydro/libhydro

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-16 05:21:59 -0800 (Tue, 16 Feb 2016)
New Revision: 67845

Modified:
   grass-addons/grass7/raster/r.green/libgreen/Makefile
   grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile
Log:
r.green: fix lib Makefiles (another attempt)

Modified: grass-addons/grass7/raster/r.green/libgreen/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/libgreen/Makefile	2016-02-16 13:11:03 UTC (rev 67844)
+++ grass-addons/grass7/raster/r.green/libgreen/Makefile	2016-02-16 13:21:59 UTC (rev 67845)
@@ -5,8 +5,9 @@
 
 MODULES = utils checkparameter __init__
 
-LIBGREENDIR = r.green/libgreen
-ETCDIR = $(ETC)/$(LIBGREENDIR)
+PGM = r.green
+LIBDIR = libgreen
+ETCDIR = $(ETC)/$(PGM)/$(LIBDIR)
 
 PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES))
 PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES))
@@ -20,4 +21,5 @@
 	$(INSTALL_DATA) $< $@
 
 install:
-	cp -r $(ETCDIR) $(INST_DIR)/etc/$(LIBGREENDIR)
+	$(MKDIR) $(INST_DIR)/etc/$(PGM)
+	cp -r $(ETCDIR) $(INST_DIR)/etc/$(PGM)/$(LIBDIR)

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile	2016-02-16 13:11:03 UTC (rev 67844)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/libhydro/Makefile	2016-02-16 13:21:59 UTC (rev 67845)
@@ -5,8 +5,9 @@
 
 MODULES = basin plant optimal __init__
 
-LIBHYDRODIR = r.green/libhydro
-ETCDIR = $(ETC)/$(LIBHYDRODIR)
+PGM = r.green
+LIBDIR = libhydro
+ETCDIR = $(ETC)/$(PGM)/$(LIBDIR)
 
 PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES))
 PYCFILES := $(patsubst %,$(ETCDIR)/%.pyc,$(MODULES))
@@ -20,4 +21,5 @@
 	$(INSTALL_DATA) $< $@
 
 install:
-	cp -r $(ETCDIR) $(INST_DIR)/etc/$(LIBHYDRODIR)
+	$(MKDIR) $(INST_DIR)/etc/$(PGM)
+	cp -r $(ETCDIR) $(INST_DIR)/etc/$(PGM)/$(LIBDIR)