diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-17 16:01:25 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-17 16:01:25 +0100 |
commit | 229f7712d48ef7b5f7324dbe66695b88c4f637b8 (patch) | |
tree | 8e0a2ac793ebcab89a9bb7e15142111660e96e64 /doc | |
parent | 03493884de0181f4a5019885267bde4f215098d8 (diff) | |
download | automake-229f7712d48ef7b5f7324dbe66695b88c4f637b8.tar.gz |
fixup: always use correct path for automake/aclocal wrappers
Otherwise, bootstrapping from a git checkout won't work anymore.
Issue introduced in today's commit 'v1.11-1974-ga98e58f'.
* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Export PATH in a
way that makes the automake and aclocal wrappers truly accessible
(the location of this wrappers has been modified in a recent commit,
but this makefile hadn't been updated accordingly).
(update_mans): Likewise.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 150e94d32..ffd294da1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -28,7 +28,8 @@ dist_man1_MANS = \ $(srcdir)/automake-$(APIVERSION).1 MAINTAINERCLEANFILES = $(dist_man1_MANS) update_mans = \ - $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \ + $(AM_V_GEN): && \ + PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ $(HELP2MAN) --output=$@ $(dist_man1_MANS): $(top_srcdir)/configure.ac @@ -72,7 +73,7 @@ dist_doc_DATA = $(srcdir)/amhello-1.0.tar.gz # configure in tests/. $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac $(AM_V_GEN): && \ - PATH="$(abs_top_builddir)/tests$(PATH_SEPARATOR)$$PATH" && \ + PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" && \ export PATH && \ $(am__cd) $(srcdir)/amhello && \ ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \ |