[GRASS-SVN] r49930 - in grass/trunk/raster/r.watershed: front ram seg

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-26 14:22:38 -0800 (Mon, 26 Dec 2011)
New Revision: 49930

Modified:
   grass/trunk/raster/r.watershed/front/main.c
   grass/trunk/raster/r.watershed/ram/Makefile
   grass/trunk/raster/r.watershed/seg/Makefile
Log:
move r.watershed's ram and seg programs to etc/r.watershed


Modified: grass/trunk/raster/r.watershed/front/main.c
===================================================================
--- grass/trunk/raster/r.watershed/front/main.c	2011-12-26 22:02:43 UTC (rev 49929)
+++ grass/trunk/raster/r.watershed/front/main.c	2011-12-26 22:22:38 UTC (rev 49930)
@@ -260,7 +260,7 @@
     }
 
     /* Build command line */
-    sprintf(command, "%s/etc/r.watershed.%s",
+    sprintf(command, "%s/etc/r.watershed/%s",
 	    G_gisbase(),
 	    flag_seg->answer ? "seg" : "ram");
     new_argv[new_argc++] = command;

Modified: grass/trunk/raster/r.watershed/ram/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/ram/Makefile	2011-12-26 22:02:43 UTC (rev 49929)
+++ grass/trunk/raster/r.watershed/ram/Makefile	2011-12-26 22:22:38 UTC (rev 49930)
@@ -1,6 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-PGM = r.watershed.ram
+PGM = r.watershed/ram
+DIR = $(ETC)/r.watershed
 
 LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(BTREE2LIB)
 DEPENDENCIES = $(RASTERDEP) $(GISDEP)
@@ -8,4 +9,7 @@
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make
 
-default: etc 
+default: $(DIR) etc
+
+$(DIR):
+	$(MKDIR) $@

Modified: grass/trunk/raster/r.watershed/seg/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/seg/Makefile	2011-12-26 22:02:43 UTC (rev 49929)
+++ grass/trunk/raster/r.watershed/seg/Makefile	2011-12-26 22:22:38 UTC (rev 49930)
@@ -1,6 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-PGM = r.watershed.seg
+PGM = r.watershed/seg
+DIR = $(ETC)/r.watershed
 
 LIBES = $(SEGMENTLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(SEGMENTDEP) $(RASTERDEP) $(GISDEP)
@@ -8,5 +9,7 @@
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make
 
-default: etc
+default: $(DIR) etc
 
+$(DIR):
+	$(MKDIR) $@