Update old configure files, in particular, copying rather than

moving template files.
Update iffe.

diff --git a/Config.mk b/Config.mk
index a37b9eb7cf3988e039dfe99ee1f5b86eba980e49..560fbab02ead72642dc703c8051ae5837bc257d4 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -4,7 +4,7 @@
 ARCH=linux.i386
 
 # specify root directory for installation
-INSTALLROOT=/home/erg/src/gviz/build/linux.i386
+INSTALLROOT=/usr/local/graphviz
 
 # specify where to find tcl >= 8.0
 TCLDIR=/usr/common/tcl8.3.3
@@ -55,10 +55,4 @@ TK_LIBDIR=$(TKDIR)/lib
 # location of tk.h
 TK_INCDIR=$(TKDIR)/include
 
-VERSION=2.5
-VERSION=2.5
-VERSION=2.5
-VERSION=2.5
-VERSION=2.5
-VERSION=2.5
-VERSION=2.5
+VERSION=2.7

diff --git a/config.h.old b/config.h.old
index 9e32934450641ad972bf9dd9d940cae27de4369c..7834ef5d879c970a4cb08699e1eb912f13c6a81c 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -1,4 +1,4 @@
-/* : : generated from configdata by iffe version 2004-08-11 : : */
+/* : : generated from config.iffe by iffe version 2004-08-11 : : */
 #ifndef _GVIZ_CONFIG_H
 #define _GVIZ_CONFIG_H 1
 #define HAVE_SYS_TYPES_H       1       /* #include <sys/types.h> ok */

diff --git a/configure.old b/configure.old
index c1cab474b3327914ccedf23feba99627b63683e6..dbb51b717409b06b129be5ed946f6ebeb8fd8e95 100755 (executable)
--- a/configure.old
+++ b/configure.old
@@ -12,10 +12,10 @@ for i in `find . -name Makefile.old`; do cp $i ${i%%.old}; done
 # do the same for config.h plus insert VERSION and BUILDDATE
 V=$(grep 'AC_INIT(graphviz' configure.ac | m4 '-DAC_INIT=$2')
 D=$(date)
-./iffe - set cc cc : run configdata | sed "s/VVVV/$V/" | sed "s/DDDD/$D/" > config.h
+./iffe - set cc cc : run config.iffe | sed "s/VVVV/$V/" | sed "s/DDDD/$D/" > config.h
 
 # Append VERSION to Config.mk
-mv Config.mk.old Config.mk
+cp Config.mk.old Config.mk
 echo "VERSION=$V" >> Config.mk
 
 # Remove cdt/ast_common.h if it came with the distribution