X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses;h=3c7be4d0e85b3637949aec567eaf0273d7df2dde;hb=4e7418a998b81ff540a3cebbbe9736267c8b6e73;hp=ea14faef8245f4dbe9313ea9deed53e8ccb8e16c;hpb=dd714b8aad61bcff68a67ff3570018d946f09067;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/ncurses b/lfs/ncurses
index ea14faef82..3c7be4d0e8 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -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/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -90,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ncurses-5.5-fixes-1.patch
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(EXTRA_MAKE)  #$(MAKETUNING) # Causes an error!
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
 	chmod -v 755 /usr/lib/*.5.5
@@ -98,14 +96,14 @@ ifeq "$(ROOT)" ""
 	mv -v /usr/lib/libncursesw.so.5* /lib
 	ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
 	cd $(DIR_APP) && for lib in curses ncurses form panel menu ; do \
-	    rm -vf /usr/lib/lib${lib}.so ; \
-	    echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \
-	    ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
+	    rm -vf /usr/lib/lib$${lib}.so ; \
+	    echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
+	    ln -sfv lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
 	done
 	ln -sfv libncurses++w.a /usr/lib/libncurses++.a4
-	echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so &&
-	ln -sfv libncurses.so /usr/lib/libcurses.so &&
-	ln -sfv libncursesw.a /usr/lib/libcursesw.a &&
+	echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so
+	ln -sfv libncurses.so /usr/lib/libcurses.so
+	ln -sfv libncursesw.a /usr/lib/libcursesw.a
 	ln -sfv libncurses.a /usr/lib/libcurses.a
 endif
 	@rm -rf $(DIR_APP)