summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
commita2e5113512e893029a6b8c52b23ab0349ca76071 (patch)
treea303c3266b1a49f104497c3b7b86b226ab99bbbd /toolchain
parent927c01dd4a45623df173880c2b54ec8024cd8964 (diff)
downloadbuildroot-novena-a2e5113512e893029a6b8c52b23ab0349ca76071.tar.gz
buildroot-novena-a2e5113512e893029a6b8c52b23ab0349ca76071.zip
Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gdb/gdb.mk2
-rw-r--r--toolchain/uClibc/uclibc.mk8
2 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 5bd296f2e..3b701e423 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -157,7 +157,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --includedir=$(STAGING_DIR)/include \
+ --includedir=$(STAGING_DIR)/usr/include \
$(DISABLE_NLS) \
--without-uiout $(DISABLE_GDBMI) \
--disable-tui --disable-gdbtk --without-x \
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 9a57758c6..d8ca8353f 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -280,13 +280,13 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.oldconfig
HOSTCC="$(HOSTCC)" \
pregen install_dev
# Install the kernel headers to the first stage gcc include dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ] ; \
then \
cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
fi
else
- if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \
+ if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \
if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ] ; then \
@@ -332,7 +332,7 @@ else
install_runtime install_dev
endif
# Install the kernel headers to the staging dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ] ; then \
cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/ ; \
fi
@@ -417,7 +417,7 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a
RUNTIME_PREFIX=/ \
install_dev
# Install the kernel headers to the target dir if necessary
-ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
+ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ] ; \
then \
cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/ ; \