X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses-compat;h=d723b99c44d3eb69d9755ebc58408995acadd359;hb=fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf;hp=1c0fb04271b87bb1209b2f43a3fe1796069232e0;hpb=59232d72251e46011b92501b7538bfe24e869ffa;p=ipfire-2.x.git

diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat
index 1c0fb04271..d723b99c44 100644
--- a/lfs/ncurses-compat
+++ b/lfs/ncurses-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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,14 +31,14 @@ 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)
 endif
 
 EXTRA_CONFIG += \
@@ -55,6 +55,8 @@ EXTRA_CONFIG += \
 	--with-termlib=tinfo \
 	--disable-nls
 
+export CPPFLAGS = -P
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -93,6 +95,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && mkdir -pv narrowc widec
 
 	# Build narrowc version.