From bed16caeb9368c84d60d9b3f958d1328929f3bfc Mon Sep 17 00:00:00 2001 From: Marcel Lorenz Date: Thu, 2 Jun 2016 19:39:50 +0200 Subject: [PATCH] pkg-config: update lfs to build in toolchain This is needed by ncureses 6.0 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer --- lfs/pkg-config | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lfs/pkg-config b/lfs/pkg-config index 3da8556efe..cd07978eaa 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +# Normal build or /tools build. +# +ifeq "$(ROOT)" "" + TARGET = $(DIR_INFO)/$(THISAPP) + PREFIX = /usr +else + TARGET = $(DIR_INFO)/$(THISAPP)-tools + PREFIX = /tools +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -70,7 +80,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib +ifeq "$(ROOT)" "" +else + mkdir /tools/lib/pkgconfig +endif + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.39.2