Merge remote-tracking branch 'amarx/BUG10796' into next

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

diff --git a/lfs/cmake b/lfs/cmake
index 56e0016a3f4c02c545870b2bbc3c74e555ece621..085d2bf2380dbd66a5d7d16a6308700d823ea7c7 100644 (file)
--- a/lfs/cmake
+++ b/lfs/cmake
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.8
+VER        = 2.6.4
 
 THISAPP    = cmake-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "armv5tel"
+       MAKETUNING = -j2
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f5dd061c31765a49dc17ae8bdc986779
+$(DL_FILE)_MD5 = 50f387d0436696c4a68b5512a72c9cde
 
 install : $(TARGET)
 
@@ -70,7 +74,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./bootstrap
+       cd $(DIR_APP) && ./bootstrap --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)