slang: revert parallelized build

[ipfire-2.x.git] / lfs / automake

diff --git a/lfs/automake b/lfs/automake
index a372443b3273e37addf53181d115cae6cadc1c4c..26d17f5406e00f65e60f8195506389f9fe2738b2 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -32,13 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.

 #
 ifeq "$(ROOT)" ""
 #
 ifeq "$(ROOT)" ""

-       PREFIX = /usr

        TARGET = $(DIR_INFO)/$(THISAPP)
 else
        TARGET = $(DIR_INFO)/$(THISAPP)
 else

-       PREFIX = /tools

        TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 
        TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 


@@ -81,8 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch

-       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
-                       --docdir=/usr/share/doc/automake-1.15
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX)

        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)