summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-10-30 21:48:21 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-10 13:44:14 +0000
commitbea72c2fecde175add169bb55df1922b048030c8 (patch)
treec2c6a971451e2e686d1273b9ffad1ef8e8550bf3 /conf/distro
parent29efbb74780d1de0694d8cdab5527599436119dc (diff)
Start removal of layout_* variables and replace these with new mechanisms to allow nextgen SDK generation (from Poky)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/iphone-compat.conf2
-rw-r--r--conf/distro/micro.conf4
-rw-r--r--conf/distro/sharprom-compatible.conf2
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf
index 74edc0fb53..be2017b7c5 100644
--- a/conf/distro/iphone-compat.conf
+++ b/conf/distro/iphone-compat.conf
@@ -5,7 +5,7 @@ DISTRO_NAME = "iphone-compat"
TARGET_OS = "darwin9"
TARGET_VENDOR = "-apple"
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} -Wl,-L${STAGING_DIR_TARGET}${layout_libdir}"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} -Wl,-L${STAGING_DIR_TARGET}${libdir}"
# Compiler selection
PREFERRED_PROVIDER_linux-libc-headers = "iphone-sdks"
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 43b00f7958..a1220ee592 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -97,8 +97,8 @@ ENABLE_BINARY_LOCALE_GENERATION = "0"
PACKAGE_SNAP_LIB_SYMLINKS = "1"
# Collapse /usr into /
-layout_prefix = ""
-layout_exec_prefix = ""
+prefix = ""
+exec_prefix = ""
# Don't install ldconfig and associated gubbins
USE_LDCONFIG = "0"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index bd3b93ec17..2ef04872fb 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -21,7 +21,7 @@ OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "tty1"
# prebuilt toolchain doesn't know about -isystem
export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${includedir}"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"