From: Ben Pfaff <blp@gnu.org>
Date: Tue, 13 Oct 2009 03:41:37 +0000 (-0700)
Subject: Don't use $< in target rules, for portability to POSIX make.
X-Git-Tag: lenny-x64-build41~3
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3580361c52f0246f71d9b727cb9e5bd0d8497bb;p=pspp-builds.git

Don't use $< in target rules, for portability to POSIX make.

POSIX only requires $< to be defined for implicit rules, so don't use it
in target rules.

With this commit, PSPP builds properly from a tarball with NetBSD make
version 1.111 on Debian GNU/Linux.
---

diff --git a/doc/automake.mk b/doc/automake.mk
index 26ff4e65..b24eb51e 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -55,7 +55,8 @@ doc/tut.texi:
 
 doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 	@$(MKDIR_P)  doc
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) $< -o - \
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$(top_srcdir)/doc/pspp.texinfo -o - \
 		| $(SED) 's/Time-&-Date/Time-\&amp;-Date/g' > $@
 
 docbookdir = $(docdir)
diff --git a/po/automake.mk b/po/automake.mk
index a36081c4..e7b13096 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -24,7 +24,7 @@ $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES)
 
 
 $(POFILES): $(POTFILE)
-	$(MSGMERGE) $(top_srcdir)/$@ $< -o $@
+	$(MSGMERGE) $(top_srcdir)/$@ $? -o $@
 
 
 SUFFIXES += .po .gmo
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index a52f2802..7c06b8e4 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -244,10 +244,10 @@ AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 	echo '#include <config.h>' > $@
-	glib-genmarshal --body --prefix=psppire_marshal $< >> $@
+	glib-genmarshal --body --prefix=psppire_marshal $? >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
-	glib-genmarshal --header --prefix=psppire_marshal $< > $@
+	glib-genmarshal --header --prefix=psppire_marshal $? > $@
 
 SUFFIXES += .glade .ui
 .glade.ui: