From 16c7951c5ae3a1b3c1a6b64b6ab560dfedb12e80 Mon Sep 17 00:00:00 2001 From: erg Date: Mon, 31 Oct 2005 17:17:42 +0000 Subject: [PATCH] Update old configure files, in particular, copying rather than moving template files. Update iffe. --- Config.mk | 10 ++-------- config.h.old | 2 +- configure.old | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Config.mk b/Config.mk index a37b9eb7c..560fbab02 100644 --- 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 9e3293445..7834ef5d8 100644 --- 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 ok */ diff --git a/configure.old b/configure.old index c1cab474b..dbb51b717 100755 --- 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 -- 2.40.0