summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m46
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f087e619e..ff44762e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 12 19:41:12 1996 Tom Yu <tlyu@voltage-multiplier.mit.edu>
+
+ * aclocal.m4: use new AC_OUTPUT syntax for constructing
+ Makefile.tmp
+
Wed Jun 12 00:23:51 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* Makefile.in (makefile-windows): Build the makefiles for
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 81244e346..8006a6fe5 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -610,7 +610,7 @@ define(V5_AC_OUTPUT_MAKEFILE,
dnl OPTIMIZE THIS FOR COMMON CASE!!
filelist=""
for x in $ac_v5_makefile_dirs; do
- filelist="$filelist $x/Makefile.tmp:$x/Makefile.in $x/pre.tmp:$ac_prepend $x/post.tmp:$ac_postpend"
+ filelist="$filelist $x/Makefile.tmp:$ac_prepend+$x/Makefile.in+$ac_postpend"
done
AC_OUTPUT($filelist,
[EOF
@@ -668,12 +668,12 @@ changequote([,])dnl
`
test "$s" = "" && s=.
echo creating $d/Makefile
- cat - $d/pre.tmp $d/Makefile.tmp $d/post.tmp append.tmp > $d/Makefile <<EOX
+ cat - $d/Makefile.tmp append.tmp > $d/Makefile <<EOX
thisconfigdir=$x
SRCTOP=$s
BUILDTOP=$x$ac_reltopdir
EOX
- rm $d/pre.tmp $d/Makefile.tmp $d/post.tmp
+ rm $d/Makefile.tmp
# sed -f $CONF_FRAGDIR/mac-mf.sed < Makefile > MakeFile
fi
done