Habe IPFire auf LFS 6.2 gebracht.

[people/teissler/ipfire-2.x.git] / lfs / m4

diff --git a/lfs/m4 b/lfs/m4
index 806f332e4330069754b30812886eea89621e899b..016b72d032fd11948e8ade62b4319d58a513eddb 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: m4,v 1.4.2.5 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 1.4
+VER        = 1.4.4
 
 THISAPP    = m4-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/m4
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
@@ -48,19 +42,11 @@ ifeq "$(ROOT)" ""
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
-ifeq "$(LFS_PASS)" "1"
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools1
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools --disable-nls
   EXTRA_LDFLAGS = -static
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
-else
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools2
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_LDFLAGS =
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-endif
 endif
 
 ###############################################################################
@@ -71,7 +57,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9eb2dd07740b2d2f3c7adb3e8d299bda
+$(DL_FILE)_MD5 = 8d1d64dbecf1494690a0f3ba8db4482a
 
 install : $(TARGET)
 
@@ -102,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && LDFLAGS="$(EXTRA_LDFLAGS)" ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)