[GRASS-SVN] r46870 - in grass-addons/grass7/raster/r.modis: . libmodis

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-30 07:42:54 -0700 (Thu, 30 Jun 2011)
New Revision: 46870

Modified:
   grass-addons/grass7/raster/r.modis/Makefile
   grass-addons/grass7/raster/r.modis/libmodis/Makefile
Log:
attempt for fix Makefiles for r.modis


Modified: grass-addons/grass7/raster/r.modis/Makefile
===================================================================
--- grass-addons/grass7/raster/r.modis/Makefile	2011-06-30 13:52:10 UTC (rev 46869)
+++ grass-addons/grass7/raster/r.modis/Makefile	2011-06-30 14:42:54 UTC (rev 46870)
@@ -8,4 +8,6 @@
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
-default: parsubdirs htmldir
\ No newline at end of file
+default: parsubdirs htmldir
+
+install: installsubdirs

Modified: grass-addons/grass7/raster/r.modis/libmodis/Makefile
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/Makefile	2011-06-30 13:52:10 UTC (rev 46869)
+++ grass-addons/grass7/raster/r.modis/libmodis/Makefile	2011-06-30 14:42:54 UTC (rev 46870)
@@ -1,16 +1,22 @@
 MODULE_TOPDIR = ../../..
 
-PGM = libmodis
+include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Python.make
 
-include $(MODULE_TOPDIR)/include/Make/Script.make
+MODULES = modis rmodislib
 
-SRCFILES = rmodislib.py modis.py
-DSTFILES := $(patsubst %,$(ETC)/r.modis/%,$(SRCFILES))
+DSTDIR = $(ETC)/r.modis
 
-default: $(DSTFILES)
+PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES))
+PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES))
 
-$(ETC)/r.modis/%: % | $(ETC)/r.modis
-	$(INSTALL) $< $@
+default: $(PYFILES) $(PYCFILES)
 
-$(ETC)/r.modis:
+$(DSTDIR):
 	$(MKDIR) $@
+
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@
+
+install:
+	cp -r $(DSTDIR) $(INST_DIR)/etc/