git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Don't unset MAKEFLAGS in non-GNU Makefile.

author Thomas Munro <tmunro@postgresql.org>

2019年6月24日 21:29:53 +0000 (09:29 +1200)

committer Thomas Munro <tmunro@postgresql.org>

2019年6月24日 21:36:21 +0000 (09:36 +1200)

It's useful to be able to pass down options like -s and -j.

Back-patch to 9.5, like commit a76200de.

Discussion: https://postgr.es/m/CA%2BhUKG%2Be1M8-BbL%3DPqhTp6oO6XPO6%2Bs9WGQMLfbuZ%3DG9CtzyXg%40mail.gmail.com

Makefile patch | blob | blame | history

diff --git a/Makefile b/Makefile

index c400854cd3d0274d07709ffe1cb01ae035b7e480..99dcfff654dc2c3e22e801913453dbb1be93db92 100644 (file)

--- 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." ; \

This is the main PostgreSQL git repository.

RSS Atom