diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-05-29 11:04:08 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-05-30 23:49:43 +0200 |
| commit | 8a8890a9152528a4fc348bb15b27ebb2a4c3b7cb (patch) | |
| tree | 584820a1a3b8f87c887d073dd38bf50668efe736 /doc/Makefile.am | |
| parent | aa6883fdcf1e7f21ea81fe4745c0018a9398d43f (diff) | |
| download | automake-8a8890a9152528a4fc348bb15b27ebb2a4c3b7cb.tar.gz | |
build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
Our build system allows the user to override AUTOCONF and AUTOHEADER
at configure time, and honours these overrides in our testsuite.
But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
This change fixes that inconsistency.
* configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
AC_SUBSTitutions. Update comments.
* tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now.
($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'.
($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'.
* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index bb48fa238..f4f76c660 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -73,8 +73,14 @@ $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ cd $(srcdir)/amhello && \ - ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \ - autoreconf -vfi && \ + ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \ + AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE && \ + AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF && \ + AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE && \ + AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF && \ + AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER && \ + AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \ + $(am_AUTORECONF) -vfi && \ ./configure && \ $(MAKE) $(AM_MAKEFLAGS) distcheck && \ $(MAKE) $(AM_MAKEFLAGS) distclean && \ |