diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-05-05 19:19:24 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-05-05 19:19:24 +0200 |
| commit | 2dc815fa21c80c26ffe16575730ebc739c253305 (patch) | |
| tree | 1c5cf3a45d2ea030de1835cf1c637c6a209acdba | |
| parent | 5b6865c4a57fbc493115fdb30559b5399fdfdf0f (diff) | |
Fix test for foreign makefiles
| -rw-r--r-- | build/bootstrap.make | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build/bootstrap.make b/build/bootstrap.make index c45f952..f42b6c6 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -95,8 +95,7 @@ endef # %frame_exclude% += include-test-foreign define include-test-foreign -$(if $(%foreign%),t,\ -$(if $(filter $(bld_root)/% $(src_root)/% $(out_root)/%,$1),,t)) +$(if $(%foreign%),t,$(if $(filter $(bld_root)/% $(src_root)/% $(out_root)/%,$1),,t)) endef @@ -104,8 +103,8 @@ endef define include-body %interactive% := %makefile% := $(call include-find-makefile,$2) -%makefile_realpath% := $(realpath $(%makefile%)) -%foreign% := $(call include-test-foreign,$(%makefile%)) +%makefile_realpath% := $$(realpath $$(%makefile%)) +%foreign% := $$(call include-test-foreign,$$(%makefile%)) $1 $$(if $$(%makefile%),$$(%makefile%),$2) @@ -154,7 +153,7 @@ define include-once-file-body %interactive% := %makefile% := $2 %makefile_realpath% := $(realpath $2) -%foreign% := $(call include-test-foreign,$(%makefile%)) +%foreign% := $$(call include-test-foreign,$$(%makefile%)) %included_files% += $$(%makefile_realpath%) @@ -185,7 +184,7 @@ define include-once-value-body %interactive% := %makefile% := $2 %makefile_realpath% := $(realpath $2) -%foreign% := $(call include-test-foreign,$(%makefile%)) +%foreign% := $$(call include-test-foreign,$$(%makefile%)) %include_once_$$(%makefile_realpath%)% += $7 |