X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fperl;h=b9b42398a13aa7f5d273eee201fb45513f1f54c3;hb=e58b46c96d2f1f2bc360fda2846ba45927aa929c;hp=8b0d30a931d96dd68393ff3d359e1fcb7cc8fab1;hpb=dd714b8aad61bcff68a67ff3570018d946f09067;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/perl b/lfs/perl
index 8b0d30a93..b9b42398a 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -1,22 +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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -79,15 +77,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ifneq "$(ROOT)" ""
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-libc-2.patch
+endif
 ifeq "$(ROOT)" ""
-	cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 \
-		-Dpager="/usr/bin/less -isR" -Dmyhostname=localhost
+	cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
+		-Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR"
+	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
+	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 else
-	cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX' -Dmyhostname=localhost
-	cd $(DIR_APP) && make $(MAKETUNING) perl utilities
+	cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
+	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
+	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
+	cd $(DIR_APP) && make perl utilities
 	cd $(DIR_APP) && cp -v perl pod/pod2man /tools/bin
 	cd $(DIR_APP) && mkdir -pv /tools/lib/perl5/$(VER)
 	cd $(DIR_APP) && cp -Rv lib/* /tools/lib/perl5/$(VER)