From e09e38a821d9a2ee64224fa1ad3186a181637565 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 May 2011 01:02:58 -0700 Subject: [PATCH] Define the list of subdir Makefiles only in configure.in. * 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. --- ChangeLog | 8 ++++++++ Makefile.in | 16 +--------------- configure.in | 21 ++++++++++----------- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4c9173f1ea..af6589db913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-24 Glenn Morris + + * 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 * make-dist: Don't distribute test/. (Bug#8107) diff --git a/Makefile.in b/Makefile.in index eacf6f12b72..f0b18ad215e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -264,22 +264,8 @@ 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 = $(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_IN = @SUBDIR_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 3d1eb286aa7..c8f561a6c5e 100644 --- a/configure.in +++ b/configure.in @@ -3712,19 +3712,18 @@ 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/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. -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 " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` + +AC_SUBST(SUBDIR_MAKEFILES_IN) +AC_CONFIG_FILES([Makefile ${SUBDIR_MAKEFILES}]) dnl Make the necessary directories, if they don't exist. AC_CONFIG_COMMANDS([mkdirs], [ -- 2.39.2