Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Peter Pfeiffer
2009-09-06 11:20:38 +02:00
7 changed files with 86 additions and 74 deletions

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = joe
PAK_VER = 0
PAK_VER = 1
DEPS = ""

View File

@@ -24,15 +24,15 @@
include Config
VER = 0.11.0
VER = svn2020
THISAPP = mediatomb-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mediatomb
PAK_VER = 1
PAK_VER = 2
DEPS = "sqlite taglib"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 661f08933830d920de21436fe122fb15
$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874
install : $(TARGET)
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install