summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-09-11 17:14:28 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-09-11 17:14:28 (GMT)
commite0a9ceef998b97e4ca4ad35306457a2d542a14cd (patch)
tree96459eadf92a14817e75b493256c4829646e0cf1
parent07549c00fbe4169247a82821e8642c30ce6bc89f (diff)
make-3.80 does not have $(lastword ...). Fix this when ct-ng calls itself: don't try to be smart, we just _know_ where ct-ng is at configure time!
Fis a latent bug in handling the number parallel jobs.
-rw-r--r--ct-ng.in14
1 files changed, 5 insertions, 9 deletions
diff --git a/ct-ng.in b/ct-ng.in
index 905cddd..050e1c0 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -5,9 +5,9 @@
# Don't print directory as we descend into them
MAKEFLAGS += --no-print-directory --no-builtin-rules
-# Remember the name of the Makefile
-CT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-CT_NG := $(CT_MAKEFILE)
+# This is where ct-ng is.
+# Don't bother to change it other than with a new ./configure!
+CT_NG:=@@CT_BINDIR@@/ct-ng
export CT_TOP_DIR:=$(shell pwd)
export CT_LIB_DIR:=@@CT_LIBDIR@@
@@ -88,14 +88,10 @@ help-env::
@false
# Actual build
-ifeq ($(CT_JOBS),)
-CT_JOBS:=1
-endif
-export CT_JOBS
-build:: .config
+build: .config
@$(CT_LIB_DIR)/scripts/crosstool.sh
-build.%::
+build.%:
@$(CT_NG) $(shell echo "$(@)" |sed -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;')
PHONY += tarball