From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 11 Jan 2009 17:27:56 +0000 (+0000)
Subject: gdb fixes: adjust --prefix & install in $(TOOLCHAIN_DIR)/usr/bin/ (like binutils... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=37e813c404dfbe73e8866ab51bd30810da531cfe

gdb fixes: adjust --prefix & install in $(TOOLCHAIN_DIR)/usr/bin/ (like binutils & gcc)


SVN-Revision: 13983
---

diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 13a3b43c9c..e4d8235c62 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -23,7 +23,7 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		gdb_cv_func_sigsetjmp=yes \
 		$(PKG_BUILD_DIR)/configure \
-		--prefix=$(TOOLCHAIN_DIR) \
+		--prefix=$(TOOLCHAIN_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
@@ -37,18 +37,20 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
-	strip $(PKG_BUILD_DIR)/gdb/gdb
 endef
 
 define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gdb/gdb $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gdb
-	ln -fs $(TARGET_CROSS)gdb $(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-gdb
+	mkdir -p $(TOOLCHAIN_DIR)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gdb/gdb $(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CROSS)gdb
+	ln -fs $(TARGET_CROSS)gdb $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)-gdb
+	strip $(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CROSS)gdb
 endef
 
 define Build/Clean
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gdb
-	rm -f $(TOOLCHAIN_DIR)/bin/$(GNU_TARGET_NAME)-gdb
+	rm -rf \
+		$(PKG_BUILD_DIR)
+		$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CROSS)gdb
+		$(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)-gdb
 endef
 
 $(eval $(call HostBuild))