# HG changeset patch
# User jwe
# Date 831979349 0
# Node ID a50f869537b98fee0f478bd32fc25104e756b665
# Parent  be6e76ca8a84799a40745abcbca18891bf0d8b64
[project @ 1996-05-13 09:17:52 by jwe]

diff -r be6e76ca8a84 -r a50f869537b9 Makeconf.in
--- a/Makeconf.in	Mon May 13 09:10:08 1996 +0000
+++ b/Makeconf.in	Mon May 13 09:22:29 1996 +0000
@@ -292,3 +292,68 @@
 define subdir-for-command
 $(foreach d, $(SUBDIRS), $(do-subdir-for-command))
 endef
+
+define do-subst-config-vals
+echo making $@ from $(srcdir)/$@.in
+sed < $(srcdir)/$@.in > $@.tmp \
+  -e "s;%VERSION%;${version};" \
+  -e "s;%config_opts%;${config_opts};" \
+  -e "s;%TARGET_HOST_TYPE%;${target_host_type};" \
+  -e "s;%F77%;${F77};" \
+  -e "s;%FFLAGS%;${FFLAGS};" \
+  -e "s;%FPICFLAG%;${FPICFLAG};" \
+  -e "s;%F2C%;${F2C};" \
+  -e "s;%F2CFLAGS%;${F2CFLAGS};" \
+  -e "s;%FLIBS%;${FLIBS};" \
+  -e "s;%CPPFLAGS%;${CPPFLAGS};" \
+  -e "s;%INCFLAGS%;-I${topincludedir} -I${includedir};" \
+  -e "s;%CC%;${CC};" \
+  -e "s;%CC_VERSION%;${CC_VERSION};" \
+  -e "s;%CFLAGS%;${BUG_CFLAGS};" \
+  -e "s;%CPICFLAG%;${CPICFLAG};" \
+  -e "s;%CXX%;${CXX};" \
+  -e "s;%CXX_VERSION%;${CXX_VERSION};" \
+  -e "s;%CXXFLAGS%;${CXXFLAGS};" \
+  -e "s;%CXXPICFLAG%;${CXXPICFLAG};" \
+  -e "s;%BUG_CXXFLAGS%;${BUG_CXXFLAGS};" \
+  -e "s;%HOST_CXXFLAGS%;${HOST_CXXFLAGS};" \
+  -e "s;%NO_IMPLICIT_TEMPLATES%;${NO_IMPLICIT_TEMPLATES};" \
+  -e "s;%GCC_IEEE_FP_FLAG%;${GCC_IEEE_FP_FLAG};" \
+  -e "s;%LDFLAGS%;${LDFLAGS};" \
+  -e "s;%LIBFLAGS%;-L${libdir};" \
+  -e "s;%RLD_FLAG%;${RLD_FLAG};" \
+  -e "s;%CXXLIBS%;${CXXLIBS};" \
+  -e "s;%TERMLIBS%;${TERMLIBS};" \
+  -e "s;%LIBS%;${LIBS};" \
+  -e "s;%LEXLIB%;${LEXLIB};" \
+  -e "s;%LIBPLPLOT%;${LIBPLPLOT};" \
+  -e "s;%LIBDLFCN%;${LIBDLFCN};" \
+  -e "s;%DEFS%;${UGLY_DEFS};"
+$(top_srcdir)/move-if-change $@.tmp $@
+endef
+
+define do-subst-default-vals
+echo "making $@ from $(srcdir)/$@.in"
+sed < $(srcdir)/$@.in > $@.tmp \
+  -e "s;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
+  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
+  -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
+  -e "s;%OCTAVE_DATADIR%;\"${datadir}\";" \
+  -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \
+  -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \
+  -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \
+  -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \
+  -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \
+  -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \
+  -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \
+  -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \
+  -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \
+  -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \
+  -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \
+  -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" \
+  -e "s;%FLIB_LIST%;\"${FLIB_LIST}\";" \
+  -e "s;%FLIB_PATH%;\"${FLIB_PATH}\";" \
+  -e "s;%CXXLIB_LIST%;\"${CXXLIB_LIST}\";" \
+  -e "s;%CXXLIB_PATH%;\"${CXXLIB_PATH}\";"
+$(top_srcdir)/move-if-change $@.tmp $@
+endef
diff -r be6e76ca8a84 -r a50f869537b9 octMakefile.in
--- a/octMakefile.in	Mon May 13 09:10:08 1996 +0000
+++ b/octMakefile.in	Mon May 13 09:22:29 1996 +0000
@@ -56,49 +56,10 @@
 all: octave-bug $(SUBDIRS)
 .PHONY: all
 
-define do-subst-config-vals
-echo making $@ from $(srcdir)/$@.in
-sed < $(srcdir)/$@.in > $@.tmp \
-  -e "s;%VERSION%;${version};" \
-  -e "s;%config_opts%;${config_opts};" \
-  -e "s;%TARGET_HOST_TYPE%;${target_host_type};" \
-  -e "s;%F77%;${F77};" \
-  -e "s;%FFLAGS%;${FFLAGS};" \
-  -e "s;%FPICFLAG%;${FPICFLAG};" \
-  -e "s;%F2C%;${F2C};" \
-  -e "s;%F2CFLAGS%;${F2CFLAGS};" \
-  -e "s;%FLIBS%;${FLIBS};" \
-  -e "s;%CPPFLAGS%;${CPPFLAGS};" \
-  -e "s;%INCFLAGS%;-I${topincludedir} -I${includedir};" \
-  -e "s;%CC%;${CC};" \
-  -e "s;%CC_VERSION%;${CC_VERSION};" \
-  -e "s;%CFLAGS%;${BUG_CFLAGS};" \
-  -e "s;%CPICFLAG%;${CPICFLAG};" \
-  -e "s;%CXX%;${CXX};" \
-  -e "s;%CXX_VERSION%;${CXX_VERSION};" \
-  -e "s;%CXXFLAGS%;${CXXFLAGS};" \
-  -e "s;%CXXPICFLAG%;${CXXPICFLAG};" \
-  -e "s;%BUG_CXXFLAGS%;${BUG_CXXFLAGS};" \
-  -e "s;%HOST_CXXFLAGS%;${HOST_CXXFLAGS};" \
-  -e "s;%NO_IMPLICIT_TEMPLATES%;${NO_IMPLICIT_TEMPLATES};" \
-  -e "s;%GCC_IEEE_FP_FLAG%;${GCC_IEEE_FP_FLAG};" \
-  -e "s;%LDFLAGS%;${LDFLAGS};" \
-  -e "s;%LIBFLAGS%;-L${libdir};" \
-  -e "s;%RLD_FLAG%;${RLD_FLAG};" \
-  -e "s;%CXXLIBS%;${CXXLIBS};" \
-  -e "s;%TERMLIBS%;${TERMLIBS};" \
-  -e "s;%LIBS%;${LIBS};" \
-  -e "s;%LEXLIB%;${LEXLIB};" \
-  -e "s;%LIBPLPLOT%;${LIBPLPLOT};" \
-  -e "s;%LIBDLFCN%;${LIBDLFCN};" \
-  -e "s;%DEFS%;${UGLY_DEFS};"
-$(top_srcdir)/move-if-change $@.tmp $@
-endef
-
-octave-bug:
+octave-bug: Makeconf octMakefile
 	@$(do-subst-config-vals)
 
-mkoctfile:
+mkoctfile: Makeconf octMakefile
 	@$(do-subst-config-vals)
 
 $(SUBDIRS):