From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 11 Feb 2012 18:09:28 +0000 (-0800)
Subject: perl-module: use $(MAKE) directly in rules that call make.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=ab27e617d38c0c074ae82c9c4d715775068baf37

perl-module: use $(MAKE) directly in rules that call make.

The GNU make manual says that $(MAKE) must appear directly in a rule
rather than through recursive expansion to work properly.  (This
change fixes a GNU make warning about an unavailable jobserver.)
---

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index f09923f137..fae888633b 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,7 +15,7 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
-MAKE_PERL = $(MAKE) $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
+PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
 
 perl-module/pspp-module-config: Makefile
 	(echo '%Locations = (';\
@@ -30,11 +30,11 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(m
 
 perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
 	rm -f $@
-	cd perl-module && $(MAKE_PERL) tardist
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist
 
 PHONY += module-make
 module-make: perl-module/Makefile
-	cd perl-module && $(MAKE_PERL)
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS)
 
 ALL_LOCAL += perl_module_tarball
 perl_module_tarball: $(module_sources) src/libpspp-core.la
@@ -49,7 +49,7 @@ perl_module_tarball: $(module_sources) src/libpspp-core.la
 	  fi ; \
 	 done \
 	fi
-	$(MAKE_PERL) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+	$(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean: