Don't unset MAKEFLAGS in non-GNU Makefile.

macdice · macdice · commit 0089c3059cb6 · 2019-06-25T09:36:21.000+12:00
It's useful to be able to pass down options like -s and -j. Back-patch to 9.5, like commit a76200d. Discussion: https://postgr.es/m/CA%2BhUKG%2Be1M8-BbL%3DPqhTp6oO6XPO6%2Bs9WGQMLfbuZ%3DG9CtzyXg%40mail.gmail.com
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
 	\
 	 if [ x"$${GMAKE+set}" = xset ]; then \
 	   echo "Using GNU make found at $${GMAKE}"; \
-	   unset MAKEFLAGS; unset MAKELEVEL; \
+	   unset MAKELEVEL; \
 	   $${GMAKE} $@ ; \
 	 else \
 	   echo "You must use GNU make to build PostgreSQL." ; \

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean`
`33`	`33`	`\`
`34`	`34`	`if [ x"$${GMAKE+set}" = xset ]; then \`
`35`	`35`	`echo "Using GNU make found at $${GMAKE}"; \`
`36`		`- unset MAKEFLAGS; unset MAKELEVEL; \`
	`36`	`+ unset MAKELEVEL; \`
`37`	`37`	`$${GMAKE} $@ ; \`
`38`	`38`	`else \`
`39`	`39`	`echo "You must use GNU make to build PostgreSQL." ; \`