summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:50:49 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:50:49 +0000
commit6322370b736a892b6736b89c36b168f4de12ad6e (patch)
tree3eb73c5c4abf4164db3004c6ee10bf3fe13949f6 /buildlib
parent066427d0be347d3bf353dc3a39d1c650e43ce7a1 (diff)
Top level make files
Author: jgg Date: 1998-07-14 05:39:36 GMT Top level make files
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/defaults.mak2
-rw-r--r--buildlib/makefile.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index adbaf2758..05a4392a5 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -36,7 +36,7 @@ BUILD_POSSIBLE = $(BASE) $(BASE)/build
endif
BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak))
-BUILD:= $(firstword $(dir $(BUILD)))
+BUILD:= $(patsubst %/,%,$(firstword $(dir $(BUILD))))
ifeq ($(words $(BUILD)),0)
error-all:
diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index a2f8300ce..596f33d9d 100644
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -10,8 +10,8 @@ export BUILD
# Chain to the parent make to do the actual building
.PHONY: headers library clean veryclean all binary program doc
-headers library clean veryclean all binary program doc:
- $(MAKE) -C $(SRCDIR) $@
+all headers library clean veryclean binary program doc:
+ $(MAKE) -C $(SRCDIR) -f Makefile $@
# This makes any missing directories
.PHONY: dirs