Revert 2011-05-24T08:02:58Z!rgm@gnu.org, for now at least.

Some automakes don't seem to like it (?).

diff --git a/ChangeLog b/ChangeLog
index 1175988d897bb6eb1b7c9427141066e7064a056e..f2368141719861bf0da75dc69029d6fc6213760e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,12 +15,6 @@
 
        * Makefile.in (TAGS, tags, check): Pass MFLAGS to sub-makes.
 
-       * configure.in (OPT_MAKEFILES_IN): Remove.
-       (SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
-       (SUBDIR_MAKEFILES_IN): New output variable.
-       * Makefile.in (OPT_MAKEFILES_IN): Remove.
-       (SUBDIR_MAKEFILES_IN): Let configure set it.
-
 2011-05-24  Glenn Morris  <rgm@gnu.org>
 
        * make-dist: Don't distribute test/.  (Bug#8107)

diff --git a/Makefile.in b/Makefile.in
index 0c3eabcf3b3180bcbbbca4b2a284fb54f9f4ce85..67b09018b551d200778c6ca724b2c6e88f396e79 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,8 +264,22 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 # checked out from a VCS.
 SUBDIR = lib lib-src src lisp
 
+# test/automated/Makefile.in, if you have it (test/ is not in the release).
+OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
+
 # The subdir makefiles created by config.status.
-SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
+SUBDIR_MAKEFILES_IN = $(srcdir)/lib/Makefile.in \
+  $(srcdir)/lib-src/Makefile.in \
+  $(srcdir)/doc/emacs/Makefile.in \
+  $(srcdir)/doc/misc/Makefile.in \
+  $(srcdir)/doc/lispref/Makefile.in \
+  $(srcdir)/doc/lispintro/Makefile.in \
+  $(srcdir)/src/Makefile.in \
+  $(srcdir)/oldXMenu/Makefile.in \
+  $(srcdir)/lwlib/Makefile.in \
+  $(srcdir)/leim/Makefile.in \
+  $(srcdir)/lisp/Makefile.in $(OPT_MAKEFILES_IN)
+
 SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 
 # Subdirectories to install, and where they'll go.

diff --git a/configure.in b/configure.in
index aa7d890781c8ac23c95748e3980e28d5edfcf1a6..f99914b641bf4ecb8c221dcf1343140090c90d17 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3701,18 +3701,19 @@ fi
 test "${exec_prefix}" != NONE &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`]
 
-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
+AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
+       doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
+       doc/lispref/Makefile src/Makefile \
+       lwlib/Makefile lisp/Makefile leim/Makefile])
 
 dnl test/ is not present in release tarfiles.
-opt_makefile=test/automated/Makefile
-
-test -f $srcdir/${opt_makefile}.in && \
-  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
-
-SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'`
-
-AC_SUBST(SUBDIR_MAKEFILES_IN)
-AC_CONFIG_FILES([Makefile ${SUBDIR_MAKEFILES}])
+if test -f $srcdir/test/automated/Makefile.in; then
+  OPT_MAKEFILES_IN="\$(srcdir)/test/automated/Makefile.in"
+  AC_CONFIG_FILES([test/automated/Makefile])
+else
+  OPT_MAKEFILES_IN=
+fi
+AC_SUBST(OPT_MAKEFILES_IN)
 
 dnl Make the necessary directories, if they don't exist.
 AC_CONFIG_COMMANDS([mkdirs], [