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

This commit is contained in:
Dirk Wagner
2010-07-10 12:41:05 +02:00
15 changed files with 88 additions and 77 deletions

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,13 +24,17 @@
include Config
VER = 3.8
VER = 2.4
THISAPP = rp-pppoe-$(VER)
THISAPP = minicom-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = minicom
PAK_VER = 0
DEPS = ""
###############################################################################
# Top-level Rules
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0e32760f498f9cde44081ee6aafc823b
$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b
install : $(TARGET)
@@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -70,8 +77,10 @@ $(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)/src && ./configure --disable-nls
cd $(DIR_APP)/src && make $(MAKETUNING)
cd $(DIR_APP)/src && make install
cd $(DIR_APP) && \
./configure \
--prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.4
VER = 2.4.5
THISAPP = ppp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29
$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
install : $(TARGET)