diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -15,15 +15,16 @@ WITHOUT ?= BUILD_CONFIG_FILE ?= $(CURDIR)/build.config -ifeq ($(WITHOUT),) + +ifeq ($(strip $(WITHOUT)),) BUILD_CONFIG = $(shell sed "s/\#.*//" $(BUILD_CONFIG_FILE)) else empty := $(subst ,, ) -BUILD_EXCLUDE = "^$(subst $(empty),\|^,$(WITHOUT))" -BUILD_CONFIG = $(shell sed "s/\#.*//" $(BUILD_CONFIG_FILE)|grep -v $(BUILD_EXCLUDE)) +BUILD_CONFIG = $(shell sed "s/\#.*//" $(BUILD_CONFIG_FILE) \ + | grep -v "^$(subst $(empty),\|^,$(WITHOUT))") endif -ERLANG_MK = erlang.mk +ERLANG_MK ?= erlang.mk ERLANG_MK_VERSION = $(shell git describe --tags --dirty) .PHONY: all check @@ -31,8 +32,8 @@ ERLANG_MK_VERSION = $(shell git describe --tags --dirty) all: export LC_COLLATE=C; \ awk 'FNR==1 && NR!=1{print ""}1' $(patsubst %,%.mk,$(BUILD_CONFIG)) \ - | sed 's/^ERLANG_MK_VERSION = .*/ERLANG_MK_VERSION = $(ERLANG_MK_VERSION)/' \ - | sed 's:^ERLANG_MK_WITHOUT = .*:ERLANG_MK_WITHOUT = $(WITHOUT):' > $(ERLANG_MK) + | sed 's/^ERLANG_MK_VERSION =.*/ERLANG_MK_VERSION = $(ERLANG_MK_VERSION)/' \ + | sed 's:^ERLANG_MK_WITHOUT =.*:ERLANG_MK_WITHOUT = $(WITHOUT):' > $(ERLANG_MK) ifdef p # Remove p from the list of variables since that conflicts with bootstrapping. |