Fix setting of BUILD_CONFIG and fix call to 'pathsub', which doesn't exist ENGINE-228
authorDamiano Boppart <damiano@pep-security.net>
Wed, 16 Aug 2017 14:45:44 +0000
branchENGINE-228
changeset 1964ec7c4b4cc8d0
parent 1963 35d308e437cf
child 1965 b62076160f76
Fix setting of BUILD_CONFIG and fix call to 'pathsub', which doesn't exist
Makefile
Makefile.conf
sync/Makefile
     1.1 --- a/Makefile	Tue Aug 15 01:04:30 2017 +0000
     1.2 +++ b/Makefile	Wed Aug 16 14:45:44 2017 +0000
     1.3 @@ -5,7 +5,6 @@
     1.4  
     1.5  HERE_REL := $(notdir $(CURDIR))
     1.6  
     1.7 -export BUILD_CONFIG:=$(CURDIR)/build-config
     1.8  include Makefile.conf
     1.9  
    1.10  export YML_PATH=$(YML2_PATH)
     2.1 --- a/Makefile.conf	Tue Aug 15 01:04:30 2017 +0000
     2.2 +++ b/Makefile.conf	Wed Aug 16 14:45:44 2017 +0000
     2.3 @@ -5,6 +5,8 @@
     2.4  
     2.5  # To use custom build configuration variables, put them in a new file at `build-config/<name>.conf`. Execute `export PLATFORM_OVERRIDE=<name>` before running make. If this environment variable is not set, make will load a default configuration for your platform.
     2.6  
     2.7 +BUILD_CONFIG:=$(dir $(lastword $(MAKEFILE_LIST)))/build-config
     2.8 +
     2.9  include $(BUILD_CONFIG)/common.conf
    2.10  # cross-compiling is currently not supported, but maybe you can hack something with `PLATFORM_OVERRIDE`
    2.11  ifeq ($(BUILD_ON),$(BUILD_FOR))
     3.1 --- a/sync/Makefile	Tue Aug 15 01:04:30 2017 +0000
     3.2 +++ b/sync/Makefile	Wed Aug 16 14:45:44 2017 +0000
     3.3 @@ -24,7 +24,7 @@
     3.4  .PHONY: clean
     3.5  clean:
     3.6  	rm -f *.xml *.xsl *.dot *.svg \
     3.7 -	$(pathsub generated/%, ../src/% $(wildcard generated/*.*)) \
     3.8 +	$(patsubst generated/%,../src/%,$(wildcard generated/*.*)) \
     3.9  	../generated/* ../skeletons/* .statemachines .actions .codegen
    3.10  
    3.11  %.xml: %.fsm