From 100d1b33f088fd38f69129afff7f9c2a1e084a57 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 24 May 2024 06:52:24 +0200
Subject: Merging upstream version 6.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 GNUmakefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 7baa19b..fcc96a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,9 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-BASH        := bash
-SHELL       := /usr/bin/env
-.SHELLFLAGS := -S '$(BASH) -Eeuo pipefail -c'
+SHELL       := bash
+.SHELLFLAGS := -Eeuo pipefail -c
 
 
 MAKEFLAGS += --no-builtin-rules
@@ -13,8 +12,7 @@ MAKEFLAGS += --warn-undefined-variables
 
 
 srcdir      := .
-DATAROOTDIR := $(srcdir)/share
-MAKEFILEDIR := $(DATAROOTDIR)/mk
+MAKEFILEDIR := $(CURDIR)/share/mk
 
 
 INFO_ :=
@@ -27,8 +25,8 @@ all: build;
 .SECONDEXPANSION:
 
 
-MK_ := $(wildcard $(addprefix $(MAKEFILEDIR)/, *.mk */*.mk */*/*.mk))
-MK  := $(srcdir)/GNUmakefile $(MK_)
+MK_ := $(wildcard $(addprefix $(MAKEFILEDIR)/, *.mk */*.mk */*/*.mk */*/*/*.mk))
+MK  := $(CURDIR)/GNUmakefile $(MK_)
 include $(MK_)
 $(MK):: ;
 
@@ -39,21 +37,21 @@ nothing:;
 
 .PHONY: help
 help:
-	$(info	$(INFO_)To see a list of .PHONY targets, run:)
+	$(info	$(INFO_)To see a list of targets, run:)
 	$(info	$(INFO_)	$$ make nothing -p \)
 	$(info	$(INFO_)	| grep '^\.PHONY:' \)
 	$(info	$(INFO_)	| tr ' ' '\n' \)
 	$(info	$(INFO_)	| grep -v '^\.PHONY:' \)
 	$(info	$(INFO_)	| sort;)
 	$(info	)
-	$(info	$(INFO_)To see a list of available variables, run:)
+	$(info	$(INFO_)To see a list of variables, run:)
 	$(info	$(INFO_)	$$ find GNUmakefile share/mk/configure -type f \)
 	$(info	$(INFO_)	| sort \)
 	$(info	$(INFO_)	| xargs grep '^[^[:space:]].*=' \)
-	$(info	$(INFO_)	| sed 's/=.*/=/';)
+	$(info	$(INFO_)	| sed 's/=.*/=/' \)
+	$(info	$(INFO_)	| grep -v -e ':DEFAULT_.*=' -e ':MAKEFILE_.*INCLUDED :=';)
 	$(info	)
-	$(info	)
-	$(info	$(INFO_)To see a list of dependencies, run:)
+	$(info	$(INFO_)To see a list of dependencies (package/program), run:)
 	$(info	$(INFO_)	$$ find share/mk/configure/build-depends -type f \)
 	$(info	$(INFO_)	| sed 's,share/mk/configure/build-depends/,,' \)
 	$(info	$(INFO_)	| sed 's,\.mk,,' \)
-- 
cgit v1.2.3