Zwischencommit fuer LFS.

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

diff --git a/lfs/coreutils b/lfs/coreutils
index dfd3cdf6eeb511d03575dbe3b23811b786bf2449..5c0284c7ed1305c2460e65f5230111515e20892e 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -85,12 +85,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(ROOT)" ""
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-suppress_uptime_kill_su-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch
        cd $(DIR_APP) && chmod +x tests/sort/sort-mb-tests
        cd $(DIR_APP) && sed -i 's/_LEN 6/_LEN 20/' src/who.c
-
+endif
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
@@ -103,7 +104,7 @@ ifeq "$(ROOT)" ""
        mv -v /usr/bin/chroot /usr/sbin
        mv -v /usr/bin/{head,sleep,nice} /bin
        ln -sf test /bin/[
-       ln -sf ../../bin/install /usr/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