X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses;h=1186b5244f3aeea2a12cc1c7f8deb37269238347;hb=6c4cc7ea1bcb58c586ae64ae6f76720b6b89bda4;hp=8ff0c0d5ec4016ef1a19158f7ad333734c472e7c;hpb=a420b3e7b9f3672b6c436cd7b773683fbf0c1f90;p=ipfire-2.x.git

diff --git a/lfs/ncurses b/lfs/ncurses
index 8ff0c0d5ec..1186b5244f 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2016  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -31,16 +31,27 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = /tools
+  PREFIX = $(TOOLS_DIR)
+  EXTRA_CONFIG = --build=$(BUILDTARGET)
 endif
 
+EXTRA_CONFIG += \
+	--prefix=$(PREFIX) \
+	--enable-widec \
+	--with-shared \
+	--without-debug \
+	--without-normal \
+	--enable-pc-files \
+	--disable-nls \
+	--mandir=/usr/share/man
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -81,19 +92,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	# Don't install a static library
 	cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
-	cd $(DIR_APP) && ./configure \
-			--prefix=$(PREFIX) \
-			--enable-widec \
-			--with-shared \
-			--without-debug \
-			--without-normal \
-			--enable-pc-files \
-			--disable-nls \
-			--mandir=/usr/share/man
+	# Create pkgconfig dir in toolchain
+ifneq "$(ROOT)" ""
+	mkdir -pv $(TOOLS_DIR)/lib/pkgconfig/
+endif
+	cd $(DIR_APP) && CPPFLAGS=-P ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-	# allow the linker to find non-wide-character Ncurses libraries
+	# allow the linker to find non-wide-character ncurses libraries
 	for lib in ncurses form panel menu; do \
 	rm -vf                     $(PREFIX)/lib/lib$${lib}.so; \
 	echo "INPUT(-l$${lib}w)" > $(PREFIX)/lib/lib$${lib}.so; \