X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses;h=1d6d0c71e46eb4e40199ff686a0413cb9c5ae613;hb=5e204d581b6ef06daa69b2ef9b0c05f7b6d8808d;hp=ea14faef8245f4dbe9313ea9deed53e8ccb8e16c;hpb=dd714b8aad61bcff68a67ff3570018d946f09067;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/ncurses b/lfs/ncurses
index ea14faef8..1d6d0c71e 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -90,7 +90,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 +98,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)