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 26ff4e651a7e0718ebef8e60f292d4c96c5fcb07..b24eb51e7e6c5458fc0ae726fc7a92e0f46a74eb 100644 (file)
--- 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 a36081c433f4a70091e48c08c7ee656024cab3c7..e7b130963647ebf9e672570d381ae7d0b970269a 100644 (file)
--- 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 a52f28028bf19056e1ee6df55b1447cffb641103..7c06b8e47bf33c5811f4ea486d7e27454499f47d 100644 (file)
--- 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: