Zwischencommit für LFS.

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

diff --git a/lfs/binutils b/lfs/binutils
index bd140c4db1ea788849af8971ebe5759947d03636..0024e5ef7353aa3e7afe9c9c5dfff3d8eee6a7b8 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -38,13 +38,13 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
+  EXTRA_MAKE = tooldir=/usr
+  EXTRA_INSTALL = tooldir=/usr
 else
-ifeq "$(LFS_PASS)" "1"
+ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = LDFLAGS="-all-static"
+  EXTRA_MAKE = #LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -94,25 +94,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-ifeq "$(ROOT)" ""
-       cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/binutils-build && make  $(EXTRA_MAKE) #$(MAKETUNING)
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+ifeq "$(ROOT)" ""
+       cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
 else
-ifeq "$(LFS_PASS)" "1"
-       cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
-       cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) clean
-       cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
-else
-       cd $(DIR_SRC)/binutils-build && make $(MAKETUNING) $(EXTRA_MAKE)
-endif
-       cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make -C ld clean
-ifeq "$(LFS_PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
+       cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
 else
+       cd $(DIR_SRC)/binutils-build && make -C ld clean
        cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
-endif
        cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
+endif
 endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
        @$(POSTBUILD)