Skip to content

Commit 484f6c0

Browse files
author
Matthias Koeppe
committed
build/make/Makefile.in: Fix handling of -n, -t, -q for script packages
1 parent 4faf798 commit 484f6c0

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

build/make/Makefile.in

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,13 @@ else
183183
AM_V_at =
184184
endif
185185

186+
# Trac #33125: Handle make options -n, -t, -q
187+
ifeq ($(foreach flag, n t q, $(findstring $(flag),$(filter-out --%,$(MAKEFLAGS)))),)
188+
PLUS = +
189+
else
190+
PLUS =
191+
endif
192+
186193
# List of targets that can be run using `sage -i` or `sage -f`
187194
# These should generally have an associated -clean target for `sage -f` to
188195
# work correctly
@@ -638,7 +645,7 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
638645
$(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
639646

640647
$(1)-$(4)-no-deps:
641-
+@if [ -z '$$($(4))' ]; then \
648+
$(PLUS)@if [ -z '$$($(4))' ]; then \
642649
echo "Error: The installation tree $(4) has been disabled" 2>&1; \
643650
echo "$$($(4)_DISABLED_MESSAGE)" 2>&1; \
644651
exit 1; \

0 commit comments

Comments
 (0)