Don't do seddery on config.status after AC_OUTPUT.

Instead just include the commands to make src/Makefile as the second arg to
AC_OUTPUT.

1 files changed, 14 insertions, 44 deletions

diff --git a/configure1.in b/configure1.in
index 630f3f23905..b4ec6c9a5a6 100755
--- a/configure1.in
+++ b/configure1.in
@@ -1389,48 +1389,18 @@ test -n "${prefix}" &&
 test -n "${exec_prefix}" &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
 ]
-AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile src/Makefile.in)
-[
+AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile src/Makefile.in, [
 # Build src/Makefile from ${srcdir}/src/Makefile.in.  This must be done
-# after src/config.h is built, since we rely on that file.  Only do the
-# build if "config.status" is present, since it's non-presence indicates
-# an error occured.
-status=$?
-if [ ! -f ./config.status ]; then
-   exit $status
-fi
-topsrcdir=${srcdir}
-makefile_command='echo "creating src/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./src;
-  cp Makefile.in junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp                                                    '\
-'    sed -e '\''s/^#.*//'\''                                    '\
-'       -e '\''s/^[ \f\t][ \f\t]*$//'\''                        '\
-'       -e '\''s/^ /    /'\''                                   '\
-'       | sed -n -e '\''/^..*$/p'\''                            '\
-'       > Makefile.new;
-    : 'There is a window of lossage if you mv Makefile.new before chmoding it.'
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $makefile_command`
-# AC-OUTPUT has created `config.status' already.  We need to add the above
-# commands to re-create `src/Makefile', and we need to insert them before
-# the final "exit 0" which appears at the end of `config.status'.
-<config.status sed -e 's/^exit 0$//' >config.new
-echo $makefile_command >>config.new
-echo exit 0 >>config.new
-mv -f config.new config.status
-chmod +x config.status
-# Don't let the fact that we just rewrote config.status make Makefile think
-# that it is now newer.  We have just rewritten all of the Makefiles as well.
-MFS="Makefile src/Makefile src/Makefile.in lib-src/Makefile oldXMenu/Makefile"
-for file in $MFS; do
-   chmod a+w $file; touch $file; chmod 444 $file
-done
-exit 0
-]
-
+# after src/config.h is built, since we rely on that file.  
+echo creating src/Makefile
+( cd src
+  rm -f junk.c
+  cp Makefile.in junk.c
+  ${CPP} -I. -I${top_srcdir}/src ${CPPFLAGS} junk.c |
+  sed -e 's/^#.*$//' -e '/^[   ]*$/d' -e 's/^ /        /' > Makefile.new
+  # There is a window of lossage if you mv Makefile.new before chmoding it.
+  chmod 444 Makefile.new
+  mv -f Makefile.new Makefile
+  rm -f junk.c
+)
+])