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

[svn_grass at osgeo.org]

Author: robertomarzocchi
Date: 2008-05-14 15:29:17 -0400 (Wed, 14 May 2008)
New Revision: 31347

Modified:
   grass-addons/raster/r.inund.fluv/Makefile
   grass-addons/raster/r.inund.fluv/README.txt
Log:


Modified: grass-addons/raster/r.inund.fluv/Makefile
===================================================================
--- grass-addons/raster/r.inund.fluv/Makefile	2008-05-14 16:09:44 UTC (rev 31346)
+++ grass-addons/raster/r.inund.fluv/Makefile	2008-05-14 19:29:17 UTC (rev 31347)
@@ -1,31 +1,32 @@
-MODULE_TOPDIR = /usr/local/grass-6.3.0RC4
+MODULE_TOPDIR = ../..
 
 PGM = r.inund.fluv
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-default: $(ETC)/fortran_code/fortran_code/$(PGM) html
+default: DIR $(ETC)/fortran_code/$(PGM) html 
 
 DIR:
-	mkdir -p  $(ETC)/fortran_code/fortran_code/
+	mkdir -p $(ETC)/fortran_code/
 
-$(ETC)/fortran_code/fortran_code/$(PGM): $(OBJ)
+$(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/fortran_code
-	$(INSTALL) clean_inundation$(EXE) $(ETC)/fortran_code/fortran_code
-	$(INSTALL) 2d_path$(EXE) $(ETC)/fortran_code/fortran_code
-	$(INSTALL) correction_from_path$(EXE) $(ETC)/fortran_code/fortran_code
-	$(INSTALL) dati.mod $(ETC)/fortran_code/fortran_code
-	$(INSTALL) dd.mod $(ETC)/fortran_code/fortran_code
+	$(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) dati.mod $(ETC)/fortran_code/
+	$(INSTALL) dd.mod $(ETC)/fortran_code/
 	$(INSTALL) $(PGM) $(GISBASE)/scripts/
 
+
 html:
 	$(MKDIR) $(GISBASE)/docs/html
-	$(INSTALL_DATA) $(PGM).html $(MODULE_TOPDIR)/docs/html/
+	$(INSTALL_DATA) $(PGM).html $(GISBASE)/docs/html/
 
 clean:
-	-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
+	-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/README.txt
===================================================================
--- grass-addons/raster/r.inund.fluv/README.txt	2008-05-14 16:09:44 UTC (rev 31346)
+++ grass-addons/raster/r.inund.fluv/README.txt	2008-05-14 19:29:17 UTC (rev 31347)
@@ -9,35 +9,18 @@
 
 ***************************REQUEST ********************************
 The installation of this code requests a fortran compiler installed on your computer. 
-The installation script (install.sh) is written for gnu fortran compiler with optimization.
-(http://www.gnu.org/software/gcc/fortran/)
-If you have an other compiler you may change the install script  (install.sh)
 
-e.g.
-gfortran -O1 -o ***.exe ***.f90
-
-where 
-*) `gfortran´ is the name of your compiler
-*) `-O1´  is the optimization option
-*) `-o ***.exe´ is the name of output executable (DO NOT CHANGE!)
-*) `***.f90´ is the name of code                 (DO NOT CHANGE!)
-
 For any other informations contact the autors of the script 
 (see description.html)
 ******************************************************************
-
-Now we're adjusting the Makefile and a simple installation is wi
-
-
-
 **************** Users of GRASS 6.3 ******************************
-1) 
+1) open the Makefile with a text editor
+2) change the relative path MODULE_TOPDIR = ../.. with the GISBASE directory
+3) make
+4) go in the source grass directory 
+5) make install 
 
-
-**************** Users of GRASS 6.2 ******************************
-1) Change the name of the script for GRASS 6.3.x releases
-mv r.inund.fluv r.inund.fluv_63
-2) Change the name of script for grass 6.2.x releases
-mv r.inund.fluv_62 r.inund.fluv
-3) 
-
+**************** Users of GRASS 6.3 ******************************
+Rename the grass scripts:
+ r.inund.fluv --> r.inund.fluv_63
+ r.inund.fluv_62 --> r.inund.fluv