[GRASS-SVN] r31233 - grass-addons/raster/r.inund.fluv

[svn_grass at osgeo.org]

Author: robertomarzocchi
Date: 2008-05-03 08:00:19 -0400 (Sat, 03 May 2008)
New Revision: 31233

Modified:
   grass-addons/raster/r.inund.fluv/Makefile
   grass-addons/raster/r.inund.fluv/install.sh
   grass-addons/raster/r.inund.fluv/r.inund.fluv
   grass-addons/raster/r.inund.fluv/r.inund.fluv_62
Log:


Modified: grass-addons/raster/r.inund.fluv/Makefile
===================================================================
--- grass-addons/raster/r.inund.fluv/Makefile	2008-05-03 11:07:43 UTC (rev 31232)
+++ grass-addons/raster/r.inund.fluv/Makefile	2008-05-03 12:00:19 UTC (rev 31233)
@@ -1,29 +1,32 @@
-MODULE_TOPDIR = ../..
+MODULE_TOPDIR = /usr/local/grass-6.3.0RC4
 
 PGM = r.inund.fluv
 
+include $(MODULE_TOPDIR)/include/Make/Script.make
 include $(MODULE_TOPDIR)/include/Make/Module.make
-include $(MODULE_TOPDIR)/include/Make/Script.make
 
+
 default: DIR $(ETC)/fortran_code/$(PGM) html
 
 DIR:
-	mkdir -p $(ETC)/fortran_code/
+	mkdir -p  $(MODULE_TOPDIR)/etc/fortran_code/
 
 $(ETC)/fortran_code/$(PGM): $(OBJ)
-	gfortran -O1 -o find_main_channel find_main_channel.f90 
-	gfortran -O1 -o clean_inundation clean_inundation.f90
-	gfortran -O1 -o 2d_path 2d_path.f90
-	gfortran -O1 -o correction_from_path correction_from_path.f90
-	$(INSTALL) find_main_channel$(EXE) $(ETC)/fortran_code
-	$(INSTALL) clean_inundation$(EXE) $(ETC)/fortran_code
-	$(INSTALL) 2d_path$(EXE) $(ETC)/fortran_code
-	$(INSTALL) correction_from_path$(EXE) $(ETC)/fortran_code
-	$(INSTALL) $(PGM) $(SCRIPT)
+	gfortran -O1 -o find_main_channel.exe find_main_channel.f90 
+	gfortran -O1 -o clean_inundation.exe clean_inundation.f90
+	gfortran -O1 -o 2d_path.exe 2d_path.f90
+	gfortran -O1 -o correction_from_path.exe correction_from_path.f90
+	$(INSTALL) find_main_channel.exe $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) clean_inundation.exe $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) 2d_path.exe $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) correction_from_path.exe $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) dati.mod $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) dd.mod $(MODULE_TOPDIR)/etc/fortran_code
+	$(INSTALL) $(PGM) $(MODULE_TOPDIR)/scripts/
 
 html:
-	$(MKDIR) $(GISBASE)/docs/html
-	$(INSTALL_DATA) $(PGM).html $(GISBASE)/docs/html/
+	$(MKDIR) $(MODULE_TOPDIR)/docs/html
+	$(INSTALL_DATA) $(PGM).html $(MODULE_TOPDIR)/docs/html/
 
 clean:
-	-rm -f find_main_channel$(EXE) clean_inundation$(EXE) 2d_path$(EXE) correction_from_path$(EXE) dati.mod dd.mod
+	-rm -f find_main_channel.exe clean_inundation.exe 2d_path.exe correction_from_path.exe dati.mod dd.mod
\ No newline at end of file

Modified: grass-addons/raster/r.inund.fluv/install.sh
===================================================================
--- grass-addons/raster/r.inund.fluv/install.sh	2008-05-03 11:07:43 UTC (rev 31232)
+++ grass-addons/raster/r.inund.fluv/install.sh	2008-05-03 12:00:19 UTC (rev 31233)
@@ -7,10 +7,10 @@
 read grass_directory
 
 if [ -e $grass_directory/fortran_code ]; then  
-    directory=$grass_directory'/fortran_code'
+    directory=$grass_directory'/etc/fortran_code'
 else
     echo "The fortran code will be put in $grass_directory/fortran_code" 
-    directory=$grass_directory'/fortran_code'
+    directory=$grass_directory'/etc/fortran_code'
     mkdir $directory
 fi
 

Modified: grass-addons/raster/r.inund.fluv/r.inund.fluv
===================================================================
--- grass-addons/raster/r.inund.fluv/r.inund.fluv	2008-05-03 11:07:43 UTC (rev 31232)
+++ grass-addons/raster/r.inund.fluv/r.inund.fluv	2008-05-03 12:00:19 UTC (rev 31233)
@@ -232,10 +232,10 @@
 
 rm -r -f ~/$cartella_nascosta
 mkdir ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/find_main_channel.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/clean_inundation.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/2d_path.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/correction_from_path.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/find_main_channel.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/clean_inundation.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/2d_path.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/correction_from_path.exe  ~/$cartella_nascosta
  
 #variables
 dtm="$GIS_OPT_DTM"

Modified: grass-addons/raster/r.inund.fluv/r.inund.fluv_62
===================================================================
--- grass-addons/raster/r.inund.fluv/r.inund.fluv_62	2008-05-03 11:07:43 UTC (rev 31232)
+++ grass-addons/raster/r.inund.fluv/r.inund.fluv_62	2008-05-03 12:00:19 UTC (rev 31233)
@@ -223,10 +223,10 @@
 
 rm -r -f ~/$cartella_nascosta
 mkdir ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/find_main_channel.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/clean_inundation.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/2d_path.exe  ~/$cartella_nascosta
-cp "$GISBASE/fortran_code"/correction_from_path.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/find_main_channel.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/clean_inundation.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/2d_path.exe  ~/$cartella_nascosta
+cp "$GISBASE/etc/fortran_code"/correction_from_path.exe  ~/$cartella_nascosta
  
 #variables
 dtm="$GIS_OPT_DTM"