X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fed;h=cfea86a9208e6e6bd8e37f066fdb7a66d9e50849;hp=3d22ed8246a7f5101ba7bb7e968de710458d07a5;hb=c8783a6ae53a40fc2b84035074f30f8d85fdf17c;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/ed b/lfs/ed
index 3d22ed8246..cfea86a920 100644
--- a/lfs/ed
+++ b/lfs/ed
@@ -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: ed,v 1.3.2.2 2005/02/05 15:38:14 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -36,7 +28,7 @@ VER        = 0.2
 
 THISAPP    = ed-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/ed
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -46,7 +38,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 objects = $(DL_FILE) $(THISAPP)-mkstemp-1.patch
 
 $(DL_FILE)                     = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-mkstemp-1.patch     = $(URL_LFS)/ed/$(THISAPP)-mkstemp-1.patch
+$(THISAPP)-mkstemp-1.patch     = $(DL_FROM)/$(THISAPP)-mkstemp-1.patch
 
 $(DL_FILE)_MD5                 = ddd57463774cae9b50e70cd51221281b
 $(THISAPP)-mkstemp-1.patch_MD5 = e7e2248f9baa76de3db8210298e0d79e
@@ -80,9 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-mkstemp-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	mv -f /usr/bin/{ed,red} /bin
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)