[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117297: * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEAD
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117297: * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): New, set by configure |
Date: |
Tue, 10 Jun 2014 02:15:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117297
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-09 22:15:49 -0400
message:
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): New, set by configure
Use throughout where appropriate.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-06-10 02:11:38 +0000
+++ b/ChangeLog 2014-06-10 02:15:49 +0000
@@ -1,5 +1,8 @@
2014-06-10 Glenn Morris <address@hidden>
+ * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL):
+ New, set by configure. Use throughout where appropriate.
+
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-06-10 02:11:38 +0000
+++ b/Makefile.in 2014-06-10 02:15:49 +0000
@@ -76,6 +76,11 @@
cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file)
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+ACLOCAL = @ACLOCAL@
+
address@hidden@
address@hidden@
address@hidden@
@@ -422,17 +427,17 @@
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS)
- cd ${srcdir} && autoconf
+ cd ${srcdir} && ${AUTOCONF}
ACLOCAL_PATH = @ACLOCAL_PATH@
ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
- cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' aclocal -I m4
+ cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4
AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
$(srcdir)/lib/gnulib.mk
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
- cd $(srcdir) && automake --gnu -a -c lib/Makefile
+ cd $(srcdir) && $(AUTOMAKE) --gnu -a -c lib/Makefile
# Regenerate files that this makefile would have made, if this makefile
# had been built by Automake. The name 'am--refresh' is for
@@ -445,9 +450,9 @@
@ # because stamp-h.in has changed (since building stamp-h.in
@ # refreshes config.in as well), but if config.in is missing
@ # then we really need to do something more.
- [ -r "$@" ] || ( cd ${srcdir} && autoheader )
+ [ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
- cd ${srcdir} && autoheader
+ cd ${srcdir} && ${AUTOHEADER}
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117297: * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): New, set by configure,
Glenn Morris <=