Update for numerous lfs-files: removed deprecated configure options

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

diff --git a/lfs/gmp b/lfs/gmp
index f8dd6bb196c55862d9c28e868409801b80a23366..4d55e4f76253c29e675e6a8cfdf17a42ae6890ab 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -32,16 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
        CONFIGURE_ARGS = ABI=32
-       BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET))
+       BUILDTARGET_PENTIUM4 = $(patsubst $(BUILD_ARCH)-%,pentium4-%,$(BUILDTARGET))
 endif
 
 CONFIGURE_OPTIONS = \
        --prefix=/usr \
-       --enable-cxx \
-       --enable-mpbsd \
-       --disable-nls
+       --enable-cxx
 
 ###############################################################################
 # Top-level Rules
@@ -89,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
        # Build SSE/SSE2 optimised version for x86
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && \