From b3db695a338f1acddbe46102138a0167fc346f58 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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/settings/dk.mk       | 3 ++-
 odk/settings/settings.mk | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'odk/settings')

diff --git a/odk/settings/dk.mk b/odk/settings/dk.mk
index f89032106d64..8f41b7e1b35a 100644
--- a/odk/settings/dk.mk
+++ b/odk/settings/dk.mk
@@ -1,4 +1,5 @@
-PLATFORMID=@@PLATFORMID@@
+PLATFORM=@@PLATFORM@@
+PROCTYPE=@@PROCTYPE@@
 SDKVERSION=@@RELEASE@@
 BUILDID=@@BUILDID@@
 LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 11537467e887..740233ee5978 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -21,10 +21,6 @@
 
 include $(OO_SDK_HOME)/settings/dk.mk
 
-# test for the platform
-PLATFORM := $(shell printf '%s' $(PLATFORMID) | cut -f 1 -d _)
-PROCTYPE := $(shell printf '%s' $(PLATFORMID) | cut -f 2- -d _)
-
 # debug option, default is no debug
 DEBUG=no
 ifeq "$(MAKECMDGOALS)" "debug"
-- 
cgit