From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] pkg-config: update lfs to build in toolchain
Date: Thu, 02 Jun 2016 19:39:50 +0200
Message-ID: <1464889191-18295-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2081667617464672883=="
List-Id: <development.lists.ipfire.org>

--===============2081667617464672883==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is needed by ncureses 6.0

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 lfs/pkg-config | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 3da8556..cd07978 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -32,6 +32,16 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+  TARGET =3D $(DIR_INFO)/$(THISAPP)
+  PREFIX =3D /usr
+else
+  TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
+  PREFIX =3D /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=3D/usr --with-internal-glib
+ifeq "$(ROOT)" ""
+else
+	mkdir /tools/lib/pkgconfig
+endif
+	cd $(DIR_APP) && ./configure --prefix=3D$(PREFIX) --with-internal-glib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--=20
1.9.1


--===============2081667617464672883==--