--- a/Makeconf.in	Sun Apr 13 23:21:38 1997 +0000
+++ b/Makeconf.in	Tue Apr 15 22:05:13 1997 +0000
@@ -294,41 +294,47 @@
 $(foreach d, $(SUBDIRS), $(do-subdir-for-command))
 endef
 
+# Yes, the second sed command near the end is needed, to avoid limits
+# in command lengths for some versions of sed.  UGLY_DEFS is often
+# quite large, so it makes sense to split this command there.
+
 define do-subst-config-vals
 echo "making $@ from $<"
 sed < $< \
-  -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${includedir} -I${octincludedir}\";" \
+  -e "s;%BUG_CXXFLAGS%;\"${BUG_CXXFLAGS}\";" \
   -e "s;%CC%;\"${CC}\";" \
   -e "s;%CC_VERSION%;\"${CC_VERSION}\";" \
   -e "s;%CFLAGS%;\"${BUG_CFLAGS}\";" \
   -e "s;%CPICFLAG%;\"${CPICFLAG}\";" \
+  -e "s;%CPPFLAGS%;\"${CPPFLAGS}\";" \
   -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;%CXX_VERSION%;\"${CXX_VERSION}\";" \
+  -e "s;%F2C%;\"${F2C}\";" \
+  -e "s;%F2CFLAGS%;\"${F2CFLAGS}\";" \
+  -e "s;%F77%;\"${F77}\";" \
+  -e "s;%FFLAGS%;\"${FFLAGS}\";" \
+  -e "s;%FLIBS%;\"${FLIBS}\";" \
+  -e "s;%FPICFLAG%;\"${FPICFLAG}\";" \
+  -e "s;%GCC_IEEE_FP_FLAG%;\"${GCC_IEEE_FP_FLAG}\";" \
   -e "s;%HOST_CXXFLAGS%;\"${HOST_CXXFLAGS}\";" \
+  -e "s;%INCFLAGS%;\"-I${includedir} -I${octincludedir}\";" \
+  -e "s;%LDFLAGS%;\"${LDFLAGS}\";" \
+  -e "s;%LEXLIB%;\"${LEXLIB}\";" \
+  -e "s;%LIBDLFCN%;\"${LIBDLFCN}\";" \
+  -e "s;%LIBFLAGS%;\"-L${libdir}\";" \
+  -e "s;%LIBPLPLOT%;\"${LIBPLPLOT}\";" \
+  -e "s;%LIBS%;\"${LIBS}\";" \
   -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;%SH_LD%;\"${SH_LD}\";" \
+  -e "s;%SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
+  -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" \
   -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \
-  -e "s;%LIBS%;\"${LIBS}\";" \
-  -e "s;%LEXLIB%;\"${LEXLIB}\";" \
-  -e "s;%LIBPLPLOT%;\"${LIBPLPLOT}\";" \
-  -e "s;%LIBDLFCN%;\"${LIBDLFCN}\";" | sed \
-  -e "s;%DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
+  -e "s;%VERSION%;\"${version}\";" \
+  -e "s;%config_opts%;\"${config_opts}\";" | \
+  sed  -e "s;%DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
 $(top_srcdir)/move-if-change $@.tmp $@
 endef
 
@@ -336,22 +342,22 @@
 echo "making $@ from $<"
 sed < $< > $@.tmp \
   -e "s;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
-  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
-  -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
+  -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \
+  -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \
   -e "s;%OCTAVE_DATADIR%;\"${datadir}\";" \
-  -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \
-  -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \
+  -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
+  -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \
+  -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \
+  -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \
   -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \
   -e "s;%OCTAVE_INFOFILE%;\"${infofile}\";" \
-  -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \
+  -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \
+  -e "s;%OCTAVE_LOCALARCHLIBDIR%;\"${localarchlibdir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \
-  -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \
-  -e "s;%OCTAVE_LOCALARCHLIBDIR%;\"${localarchlibdir}\";" \
+  -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \
   -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \
-  -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \
-  -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \
-  -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \
+  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
   -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";"
 $(top_srcdir)/move-if-change $@.tmp $@
 endef