X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flcr;h=061cde9ce498d9bf68ad6497261fff961e741ef4;hb=811a52519104150ebe845f391d936f83b4001135;hp=b85344f2b3464446b6d3545e9834cffdd74e1c63;hpb=6d263ef950fea74e7f1bcd42d58d7017bfe974d4;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/lcr b/lfs/lcr
index b85344f2b..061cde9ce 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,15 +24,15 @@
 
 include Config
 
-VER        = 64143650bc9c04fadc99694c499cf34750bc2804
+VER        = 20121008
 
-THISAPP    = lcr.git-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = lcr-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcr
-PAK_VER    = 1
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 972af4b1f72874700e247db4c12992af
+$(DL_FILE)_MD5 = 6c5e25329be107e30436b716bafc786f
 
 install : $(TARGET)
 
@@ -76,16 +76,20 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
-	cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
-	cd $(DIR_SRC)/lcr.git && ./configure --prefix=/usr
-	cd $(DIR_SRC)/lcr.git && make $(MAKETUNING)
-	cd $(DIR_SRC)/lcr.git && make install
+	@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_SRC)/lcr && sed -i -e "s|^EXTENSIONdir=.*|EXTENSIONdir=/var/ipfire/lcr/extensions|g" \
+					Makefile.am
+	cd $(DIR_SRC)/lcr && ./autogen.sh
+	cd $(DIR_SRC)/lcr && ./configure --prefix=/usr \
+					 --sysconfdir=/var/ipfire \
+					 --localstatedir=/var \
+					 --datarootdir=/var/ipfire
+	cd $(DIR_SRC)/lcr && make $(MAKETUNING)
+	cd $(DIR_SRC)/lcr && make install
 	mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org
 	install -v -m 644 $(DIR_SRC)/config/lcr/routing.conf \
 	                        /var/ipfire/lcr/routing.conf
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
-	                 /var/ipfire/backup/addons/includes/lcr			 
-	@rm -rf $(DIR_APP)
+	                 /var/ipfire/backup/addons/includes/lcr
+	@rm -rf $(DIR_SRC)/lcr
 	@$(POSTBUILD)