From: Akim Demaille <akim@lrde.epita.fr>
Date: Sun, 1 Apr 2012 12:27:23 +0000 (+0200)
Subject: build: don't rely on $< in non-pattern rules.
X-Git-Tag: v2.7.90~462
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/da83f838210859531b0b2cbf16fd4efbd811fe12?ds=inline

build: don't rely on $< in non-pattern rules.

* doc/local.mk, tests/local.mk: here.
Reported by Stefano Lattarini.
---

diff --git a/doc/local.mk b/doc/local.mk
index 513e548a..b859c4b3 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -80,9 +80,9 @@ doc/refcard.ps: doc/refcard.dvi
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
-	$(AM_V_GEN)$< --version >doc/bison.help.t
-	$(AM_V_at)$< --help   >>doc/bison.help.t
-	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.t $@
+	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
+	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
+	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
 
 
 ## ----------- ##
diff --git a/tests/local.mk b/tests/local.mk
index 2cb1f3c1..4f2ee52d 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -40,7 +40,6 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
 ## Generate the test suite.  ##
 ## ------------------------- ##
 
-## Leave testsuite.at first for the "testsuite" rule's $<.
 TESTSUITE_AT =                                  \
   tests/testsuite.at                            \
                                                 \
@@ -71,7 +70,8 @@ TESTSUITE = $(top_srcdir)/tests/testsuite
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests
 $(TESTSUITE): $(TESTSUITE_AT)
-	$(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp
+	$(AM_V_GEN) \
+	  $(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/tests/testsuite.at -o $@.tmp
 	$(AM_V_at)mv $@.tmp $@