collectd: Fix compiling against newer xfsprogs

[people/pmueller/ipfire-2.x.git] / lfs / ncurses

diff --git a/lfs/ncurses b/lfs/ncurses
index 8ff0c0d5ec4016ef1a19158f7ad333734c472e7c..ba5afcefd04181916f76048b4958d405ce4be690 100644 (file)
--- 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-2018  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,25 @@ 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
+  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 +90,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; \