[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104352: Revert r104345, for now at l
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104352: Revert r104345, for now at least. |
Date: |
Tue, 24 May 2011 12:30:13 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104352
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-24 12:30:13 -0400
message:
Revert r104345, for now at least.
Some automakes don't seem to like it (?).
modified:
ChangeLog
Makefile.in
configure.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-05-24 08:16:58 +0000
+++ b/ChangeLog 2011-05-24 16:30:13 +0000
@@ -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 <address@hidden>
* make-dist: Don't distribute test/. (Bug#8107)
=== modified file 'Makefile.in'
--- a/Makefile.in 2011-05-24 08:12:52 +0000
+++ b/Makefile.in 2011-05-24 16:30:13 +0000
@@ -264,8 +264,22 @@
# 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.
=== modified file 'configure.in'
--- a/configure.in 2011-05-24 08:16:58 +0000
+++ b/configure.in 2011-05-24 16:30:13 +0000
@@ -3701,18 +3701,19 @@
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], [
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104352: Revert r104345, for now at least.,
Glenn Morris <=