X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses;h=ba5afcefd04181916f76048b4958d405ce4be690;hb=aba59b7c7664f83e0b07a8fa0dc1f133d3fe55d3;hp=1d8fd40d2181e0da29b9e42f514833686628cabd;hpb=e3acfbc1c7f409974b5f7ab29cdda7f94e779588;p=ipfire-2.x.git diff --git a/lfs/ncurses b/lfs/ncurses index 1d8fd40d21..ba5afcefd0 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team # +# Copyright (C) 2007-2018 IPFire Team # # # # 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,12 @@ 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 @@ -94,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in # Create pkgconfig dir in toolchain ifneq "$(ROOT)" "" - mkdir -pv /tools/lib/pkgconfig/ + mkdir -pv $(TOOLS_DIR)/lib/pkgconfig/ endif cd $(DIR_APP) && CPPFLAGS=-P ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(MAKETUNING)