Updated to reflect some minor tool reorganization and the creation of class

to handle DEM processing needs.

diff --git a/Tools/Makefile b/Tools/Makefile
index 6a4ed347f43a419bc9170bd83fd6b44afce4e269..370d4ef55181e1312cc848ecb2ece1e9df1a05ec 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -27,9 +27,10 @@
 include $(FG_ROOT_SRC)/commondefs
 
 
-SUBDIRS = gpc2.01 AssemTris Dem2node DemRaw2Ascii FixNode FixObj SplitTris \
-       Stripe_u Tri2obj Triangle
-ORDEREDDIRS = $(SUBDIRS)
+LIBDIRS = DEM gpc2.01
+SUBDIRS = Areas AssemTris Dem2node DemRaw2Ascii FixNode FixObj \
+       SplitTris Stripe_u Tri2obj Triangle
+ORDEREDDIRS = $(LIBDIRS) $(SUBDIRS)
 
 
 all: 
@@ -90,6 +91,10 @@ bin-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.13  1998/03/19 02:52:51  curt
+# Updated to reflect some minor tool reorganization and the creation of class
+# to handle DEM processing needs.
+#
 # Revision 1.12  1998/03/19 01:48:34  curt
 # Added gpc-2.01 (generic polygon clipping library)
 #

diff --git a/Tools/process-dem.pl b/Tools/process-dem.pl
index 8737d2744dae536bcebfc526694a11003e807df7..a9c0ba05eeb73b77435832c8669d565581ae92e5 100755 (executable)
--- a/Tools/process-dem.pl
+++ b/Tools/process-dem.pl
@@ -110,9 +110,9 @@ sub file_root {
 
 sub demfit {
     if ( $dem_file =~ m/.gz$/ ) {
-       $command = "gzip -dc $dem_file | ./Dem2node/demfit $ENV{FG_ROOT} - $error";
+       $command = "gzip -dc $dem_file | ./Dem2node/dem2node $ENV{FG_ROOT} - $error";
     } else {
-       $command = "./Dem2node/demfit $ENV{FG_ROOT} $dem_file $error";
+       $command = "./Dem2node/dem2node $ENV{FG_ROOT} $dem_file $error";
     }
 
     print "Running '$command'\n";
@@ -364,6 +364,10 @@ sub fixobj {
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.13  1998/03/19 02:52:52  curt
+# Updated to reflect some minor tool reorganization and the creation of class
+# to handle DEM processing needs.
+#
 # Revision 1.12  1998/03/19 01:48:35  curt
 # Added gpc-2.01 (generic polygon clipping library)
 #