]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'stevee/mc-update' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Dec 2012 20:57:38 +0000 (21:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Dec 2012 20:57:38 +0000 (21:57 +0100)
1  2 
lfs/mc

diff --combined lfs/mc
index 895b2d49c296fb0f2c89f703200476ae296e9eae,caf2f68fde602c141485bfddc8c6b41bf733da16..32946c17abe4ee734e906405a7247ceaa78f0c46
--- 1/lfs/mc
--- 2/lfs/mc
+++ b/lfs/mc
  
  include Config
  
- VER        = 4.7.5.2
+ VER        = 4.8.4
  
  THISAPP    = mc-$(VER)
- DL_FILE    = $(THISAPP).tar.lzma
+ DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = mc
- PAK_VER    = 5
+ PAK_VER    = 6
  
 -DEPS       = "glib"
 +DEPS       = ""
  
  ###############################################################################
  # Top-level Rules
@@@ -44,7 -44,7 +44,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da
+ $(DL_FILE)_MD5 = a8edb8226cb25869f925ecce043faf1e
  
  install : $(TARGET)
  
@@@ -76,8 -76,9 +76,9 @@@ $(subst %,%_MD5,$(objects)) 
  
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) --lzma
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr \
+                               --sysconfdir=/etc \
                                --without-x --disable-nls \
                                --with-samba \
                                --with-screen=ncurses