Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

[people/teissler/ipfire-2.x.git] / lfs / coreutils

diff --git a/lfs/coreutils b/lfs/coreutils
index eb709a86b364933ad00efe6ccacfbfd66f06edc4..d5c437dd102b31c938b853a211132d91cb5705cf 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -40,11 +40,13 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls --host=$(MACHINE)
+  EXTRA_CONFIG = --prefix=/tools --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 
+EXTRA_CONFIG += --build=$(BUILDTARGET)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -107,15 +109,13 @@ ifeq "$(ROOT)" ""
        ln -sf test /bin/[
        #ln -sf ../../bin/install /usr/bin
        mv -f /bin/uname /bin/uname.bak
-       echo '#!/bin/bash'                              >  /bin/uname
-       echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname
+       cp -vf $(DIR_SRC)/src/scripts/uname /bin/uname
        chmod 755 /bin/uname
        dircolors -p > /etc/dircolors
 else
        rm /tools/bin/hostname
        mv -f /tools/bin/uname /tools/bin/uname.bak
-       echo '#!/bin/bash'                                      >  /tools/bin/uname
-       echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g''     >> /tools/bin/uname
+       cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
        chmod 755 /tools/bin/uname
 endif
        @rm -rf $(DIR_APP)