Update for numerous lfs-files: removed deprecated configure options

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

diff --git a/lfs/automake b/lfs/automake
index a372443b3273e37addf53181d115cae6cadc1c4c..0b3d9cce89574512855e5a9c033bd163d69a275d 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -32,13 +32,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
        PREFIX = /usr
        TARGET = $(DIR_INFO)/$(THISAPP)
 else
-       PREFIX = /tools
+       PREFIX = $(TOOLS_DIR)
        TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 
@@ -81,8 +81,10 @@ $(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
-       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
-                       --docdir=/usr/share/doc/automake-1.15
+       cd $(DIR_APP) && ./configure \
+               --prefix=$(PREFIX) \
+               --docdir=/usr/share/doc/automake-1.15
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)