X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftcl;h=e863729232713fe0ccbfae9da479d61f26fea15f;hp=5cfb57c65fed10954a870d8f3e2540e5073b1b33;hb=dd4796fbea96922f3bf58bcf866cf9ea7aaa70f0;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/tcl b/lfs/tcl
index 5cfb57c65..e86372923 100644
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: tcl,v 1.4.2.4 2006/01/20 13:59:20 franck78 Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,18 @@
 
 include Config
 
-VER        = 8.4.6
+VER        = 8.4.13
 
 THISAPP    = tcl$(VER)
 DL_FILE    = $(THISAPP)-src.tar.gz
-DL_FROM    = $(URL_SFNET)/tcl
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+ifneq "$(ROOT)" ""
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9009a92dc648775fb8a9b0789b995756
+$(DL_FILE)_MD5 = c6b655ad5db095ee73227113220c0523
 
 install : $(TARGET)
 
@@ -78,12 +75,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	#remove a syntax error in tcl. Appears with recent bash.
-	#tcl 8.4.13 will correct this bug, so next line can go away
-	cd $(DIR_APP) && sed -i "s/relid'/relid/g" unix/configure
+ifneq "$(ROOT)" ""
 	cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls
-	cd $(DIR_APP)/unix && make
+else
+	cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+endif
+	cd $(DIR_APP)/unix && make $(MAKETUNING)
 	cd $(DIR_APP)/unix && make install
+ifneq "$(ROOT)" ""
+	cd $(DIR_APP)/unix && make install-private-headers
 	ln -sf tclsh8.4 /tools/bin/tclsh
+else
+	ln -sf tclsh8.4 /usr/bin/tclsh
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)