Merge branch 'ssp'

[people/amarx/ipfire-3.x.git] / lfs / coreutils

diff --git a/lfs/coreutils b/lfs/coreutils
index 4bf1c258762d21a80e884f6363890347e0c0665f..9cdaf46ad79e7988c2d51eba8bd245ad8b928bf5 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -41,22 +41,23 @@ objects = $(DL_FILE) $(THISAPP)-uname_PIC-1.patch $(THISAPP)-i18n-1.patch
 
 install : $(TARGET)
 
-download : $(patsubst %,$(DIR_DL)/%,$(objects))
+download : $(objects)
 
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
+$(objects) :
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+$(TARGET) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        
 ifeq "$(STAGE)" "toolchain"    
-       cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --enable-install-program=hostname
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) \
+                               --enable-install-program=hostname
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        
        cd $(DIR_APP) && cp -v src/su $(TOOLS_DIR)/bin/su-tools
@@ -68,7 +69,7 @@ ifeq "$(STAGE)" "base"
        
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-install-program=hostname \
                                --enable-no-install-program=kill,uptime
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        
        mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin