From b3db695a338f1acddbe46102138a0167fc346f58 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 30 Jan 2014 17:12:40 +0100 Subject: SDK: Split PLATFORMID at build time rather than runtime ...where $(shell printf ...) in settings.mk likely doesn't work on Windows. Change-Id: I64a51203d1bf131160768f9a9069f428228aa6b1 --- odk/CustomTarget_settings.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'odk/CustomTarget_settings.mk') diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index fe3b1e4c73dc..c48a734623c9 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -13,7 +13,9 @@ $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) $(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) - tr -d "\015" < $< | sed -e 's/@@PLATFORMID@@/$(PLATFORMID)/' \ + tr -d "\015" < $< | sed \ + -e 's/@@PLATFORM@@/$(firstword $(subst _, ,$(PLATFORMID)))/' \ + -e 's/@@PROCTYPE@@/$(subst $(WHITESPACE),_,$(wordlist 2,$(words $(subst _, ,$(PLATFORMID))),$(subst _, ,$(PLATFORMID))))/' \ -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ -e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@ -- cgit