diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:08 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:08 +0000 |
| commit | 93641593cafac296b9072288d8ef9e1a526d745b (patch) | |
| tree | 5dfa5b05a5a082e2d5acd443141d7c9b09d5f037 /buildlib | |
| parent | 9391a747a8b94474e2d75db82dfb7fcef720e9ef (diff) | |
Upgraded to eg++ 1.1 and libstdc++2.9
Author: jgg
Date: 1998-10-20 04:33:11 GMT
Upgraded to eg++ 1.1 and libstdc++2.9
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/defaults.mak | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c9a501e84..c6a2c15d7 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -30,19 +30,21 @@ # Search for the build directory ifdef BUILD -BUILD_POSSIBLE = $(BUILD) +BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD) else -BUILD_POSSIBLE = $(BASE) $(BASE)/build +BUILD_POSSIBLE := $(BASE) $(BASE)/build endif -BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak)) -BUILD:= $(patsubst %/,%,$(firstword $(dir $(BUILD)))) +BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*)) +BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX)))) -ifeq ($(words $(BUILD)),0) +ifeq ($(words $(BUILDX)),0) error-all: echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD= endif +override BUILD := $(BUILDX) + # Base definitions INCLUDE := $(BUILD)/include BIN := $(BUILD)/bin @@ -77,6 +79,7 @@ LDFLAGS+= -L$(LIB) # Phony rules. Other things hook these by appending to the dependency # list .PHONY: headers library clean veryclean all binary program doc +.PHONY: maintainer-clean dist-clean distclean pristine sanity all: binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean |