From 70716b1dcadf62d61ce4b3f7279fac2aeae3bd55 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 May 2011 13:23:15 -0400 Subject: Reimplement trunk 2011-05-24T08:02:58Z!rgm@gnu.org in a way visible to automake. * 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. --- configure.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index f99914b641b..f0520902abb 100644 --- a/configure.in +++ b/configure.in @@ -3701,19 +3701,20 @@ fi test "${exec_prefix}" != NONE && exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`] -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]) +SUBDIR_MAKEFILES="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. -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) +opt_makefile=test/automated/Makefile + +test -f $srcdir/${opt_makefile}.in && \ + SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile" + +SUBDIR_MAKEFILES_IN=`echo " lib/Makefile ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` + +AC_SUBST(SUBDIR_MAKEFILES_IN) +dnl Any directory using automake (ie lib/) has to be explicitly listed, +dnl else automake fails with "no `Makefile.am' found for any configure output". +AC_CONFIG_FILES([Makefile lib/Makefile ${SUBDIR_MAKEFILES}]) dnl Make the necessary directories, if they don't exist. AC_CONFIG_COMMANDS([mkdirs], [ -- cgit v1.2.1