[GRASS-SVN] r31607 - grass-addons/gipe

[svn_grass at osgeo.org]

Author: ychemin
Date: 2008-06-02 05:34:45 -0400 (Mon, 02 Jun 2008)
New Revision: 31607

Modified:
   grass-addons/gipe/install_yanns_grass.sh
Log:
updated Makefiles to a cleaner install (Thanks to Hamish)

Modified: grass-addons/gipe/install_yanns_grass.sh
===================================================================
--- grass-addons/gipe/install_yanns_grass.sh	2008-06-02 08:25:39 UTC (rev 31606)
+++ grass-addons/gipe/install_yanns_grass.sh	2008-06-02 09:34:45 UTC (rev 31607)
@@ -26,7 +26,7 @@
 do
 	cp -rf $HFDIR/$directory $GRASSCVSDIR/raster/
 done
-cp -rf $GIPEDIR/PM_Makefile $GRASSCVSDIR/raster/r.evapo.PM/Makefile
+cp -rf $GIPEDIR/Makefile.PM $GRASSCVSDIR/raster/r.evapo.PM/Makefile
 
 cd $RSTDIR/
 for directory in r.inund.fluv*
@@ -34,9 +34,9 @@
 	cp -rf $RSTDIR/$directory $GRASSCVSDIR/raster/
 done
 
-cp -f $GIPEDIR/Makefile $GRASSCVSDIR/raster/ 
+cp -f $GIPEDIR/Makefile.raster $GRASSCVSDIR/raster/Makefile.gipe 
 cd $GRASSCVSDIR/raster/
-make
+make -f Makefile.gipe
 #END RASTER STUFF
 
 #START IMAGERY STUFF
@@ -58,16 +58,16 @@
 	cp -rf $ADDONSVNDIR/imagery/$directory $GRASSCVSDIR/imagery/ 
 done
 
-cp -f $GIPEDIR/imagery_Makefile $GRASSCVSDIR/imagery/Makefile
+cp -f $GIPEDIR/Makefile.imagery $GRASSCVSDIR/imagery/Makefile.gipe
 cd $GRASSCVSDIR/imagery/
-make
+make -f Makefile.gipe
 #END IMAGERY STUFF
 
 #Install m.gem in /scripts
 cp -rf $GIPEDIR/m.gem $GRASSCVSDIR/scripts/ 
-cp -f $GIPEDIR/scripts_Makefile $GRASSCVSDIR/scripts/Makefile 
+cp -f $GIPEDIR/Makefile.scripts $GRASSCVSDIR/scripts/Makefile.gipe 
 cd $GRASSCVSDIR/scripts/
-make
+make -f Makefile.scripts
 
 #Install GUI stuff
 cp -rf $GIPEDIR/gmmenu.tcl $GRASSCVSDIR/gui/tcltk/gis.m/