Fix build problems

9 files changed, 19 insertions, 18 deletions

diff --git a/INSTALL b/INSTALL
index 198b0ba..2223ab3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.3-20001105
+DOXYGEN Version 1.2.3-20001106
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (05 November 2000)
+Dimitri van Heesch (06 November 2000)
diff --git a/README b/README
index 85f85ee..81ca273 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.3-20001105
+DOXYGEN Version 1.2.3-20001106
 
 Please read INSTALL for compilation instructions.
 
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (05 November 2000)
+Dimitri van Heesch (06 November 2000)
diff --git a/VERSION b/VERSION
index 6f864e2..423d152 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.3-20001105
+1.2.3-20001106
diff --git a/addon/configgen/Makefile.in b/addon/configgen/Makefile.in
index a58d145..40aff7d 100644
--- a/addon/configgen/Makefile.in
+++ b/addon/configgen/Makefile.in
@@ -16,7 +16,7 @@ all: Makefile.configgen config.h config.l
 	$(MAKE) -f Makefile.configgen $@
 
 Makefile.configgen: configgen.pro 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) configgen.pro >Makefile.configgen
+	$(ENV) $(PERL) $(TMAKE) configgen.pro >Makefile.configgen
 
 config.h: $(CFGGEN_DIR)/configgen config_templ.h
 	$(CFGGEN_DIR)/configgen config_templ.h >config.h
@@ -28,7 +28,7 @@ $(CFGGEN_DIR)/configgen: Makefile.configgen configgen.cpp
 	$(MAKE) -f Makefile.configgen 
 
 tmake: 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) configgen.pro >Makefile.configgen
+	$(ENV) $(PERL) $(TMAKE) configgen.pro >Makefile.configgen
 
 install:
 	$(CP) config.l config.h ../../src
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 243d68c..fee009b 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -18,7 +18,7 @@ all: $(CFGGENBIN_DIR)/configgen config.h config.l doxywizard.cpp doxywizard.h \
 	$(MAKE) -f Makefile.doxywizard $@
 
 Makefile.doxywizard: doxywizard.pro doxywizard.t
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
+	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
 
 config.l: $(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.l
 	$(CFGGENBIN_DIR)/configgen $(CFGGENSRC_DIR)/config_templ.l >config.l
@@ -36,7 +36,7 @@ $(CFGGENBIN_DIR)/configgen: $(CFGGENSRC_DIR)/configgen.cpp
 	$(MAKE) -C $(CFGGENSRC_DIR) 
 
 tmake: 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
+	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
 
 clean: Makefile.doxywizard 
 	$(MAKE) -f Makefile.doxywizard clean 
diff --git a/configure b/configure
index 9a4fb65..c8a79f0 100755
--- a/configure
+++ b/configure
@@ -328,6 +328,7 @@ test -f .tmakeconfig && rm .tmakeconfig
 cat > .makeconfig <<EOF
 DOXYGEN   = $PWD
 TMAKEPATH = $PWD/tmake/lib/$f_platform
+ENV       = env TMAKEPATH=\$(TMAKEPATH)
 TMAKE     = $PWD/tmake/bin/tmake
 MAKE      = $f_make
 PERL      = $f_perl
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index f218c99..2f88793 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,5 +1,5 @@
 Name: doxygen
-Version: 1.2.3-20001105
+Version: 1.2.3-20001106
 Summary: documentation system for C, C++ and IDL
 Release: 1
 Source0: doxygen-%{version}.src.tar.gz
diff --git a/qtools/Makefile.in b/qtools/Makefile.in
index ae5bec9..78710fd 100644
--- a/qtools/Makefile.in
+++ b/qtools/Makefile.in
@@ -17,10 +17,10 @@ all: Makefile.qtools Makefile
 	$(MAKE) -f Makefile.qtools    $@
 
 Makefile.qtools: qtools.pro 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) qtools.pro >Makefile.qtools
+	$(ENV) $(PERL) $(TMAKE) qtools.pro >Makefile.qtools
 
 tmake: 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) qtools.pro >Makefile.qtools
+	$(ENV) $(PERL) $(TMAKE) qtools.pro >Makefile.qtools
 
 clean: Makefile.qtools 
 	$(MAKE) -f Makefile.qtools    clean 
diff --git a/src/Makefile.in b/src/Makefile.in
index 586b439..31ab7f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,18 +20,18 @@ all: Makefile.doxygen Makefile.doxytag Makefile.doxysearch Makefile
 	$(MAKE) -f Makefile.doxysearch $@
 
 Makefile.doxygen: doxygen.pro doxygen.t 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
+	$(ENV) $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
 
 Makefile.doxytag: doxytag.pro doxytag.t 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
+	$(ENV) $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
 
 Makefile.doxysearch: doxysearch.pro
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
+	$(ENV) $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
 
 tmake: 
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
-	export TMAKEPATH=$(TMAKEPATH) ; $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
+	$(ENV) $(PERL) $(TMAKE) doxygen.pro >Makefile.doxygen
+	$(ENV) $(PERL) $(TMAKE) doxytag.pro >Makefile.doxytag
+	$(ENV) $(PERL) $(TMAKE) doxysearch.pro >Makefile.doxysearch
 
 clean: Makefile.doxygen Makefile.doxytag Makefile.doxysearch
 	$(MAKE) -f Makefile.doxygen    clean