From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 17 Feb 2012 15:01:25 +0000 (+0100)
Subject: fixup: always use correct path for automake/aclocal wrappers
X-Git-Tag: v1.11b~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=229f7712d48ef7b5f7324dbe66695b88c4f637b8;p=thirdparty%2Fautomake.git

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.
---

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 && \