X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flcr;h=061cde9ce498d9bf68ad6497261fff961e741ef4;hp=d6734ed9d56113f91976b94084810281fd941e5f;hb=5354d0f5c902f208d755b3b8a06f5896d4d2c975;hpb=12a8cc1ed90b108fbbcb2d1093e754f05e98bdc1

diff --git a/lfs/lcr b/lfs/lcr
index d6734ed9d5..061cde9ce4 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# 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        = 1.10
+VER        = 20121008
 
 THISAPP    = lcr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcr
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ccde843ee92f4d75f697d8a9e9fa3ba9
+$(DL_FILE)_MD5 = 6c5e25329be107e30436b716bafc786f
 
 install : $(TARGET)
 
@@ -76,10 +76,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
-	cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
-	cd $(DIR_SRC)/lcr && ./configure --prefix=/usr
+	@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