[packages] binutils: move /usr/bin/strings to /bin/strings, avoids clash with busybox...

[openwrt/svn-archive/archive.git] / devel / binutils / Makefile

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 5925fdd5208e25cf3cc56eebce452e93282e6640..50580e458da920a14b89e8f1820240734ae60606 100644 (file)
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=binutils
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
 #"))
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=@GNU/binutils
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
@@ -47,7 +47,6 @@ CONFIGURE_ARGS = \
                --target=$(REAL_GNU_TARGET_NAME) \
                --host=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
-               --with-sysroot=$(PKG_INSTALL_DIR) \
                --prefix=/usr \
                --disable-multilib \
                --disable-werror \
@@ -72,7 +71,7 @@ define Build/Configure
                configure-libiberty \
                configure-opcodes \
        )
-       $(MAKE) CFLAGS="$(TARGET_CFLAGS)"-C $(PKG_BUILD_DIR)/bfd/po Makefile
+       $(MAKE) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)/bfd/po Makefile
 endef
 
 define Build/InstallDev
@@ -102,8 +101,9 @@ define Package/objdump/install
 endef
 
 define Package/binutils/install
-       $(INSTALL_DIR) $(1)/usr
+       $(INSTALL_DIR) $(1)/usr $(1)/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
+       mv $(1)/usr/bin/strings $(1)/bin/strings
        rm -f $(1)/usr/bin/objdump
 endef