X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpkg-config;h=3d039ddf28478b630b6033e57bfd1b6fb5af11d3;hb=a1eb7761991af6515bd3b08f598454c7720119f8;hp=3da8556efe9df080d30c24143d0748d83a3805b5;hpb=c485f38c996cab87c98a78f1cadc2c2197d30625;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 3da8556efe..3d039ddf28 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.29
+VER        = 0.29.2
 
 THISAPP    = pkg-config-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# Normal build or $(TOOLS_DIR) build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 77f27dce7ef88d0634d0d6f90e03a77f
+$(DL_FILE)_MD5 = f6e931e319531b736fadc017f470e68a
 
 install : $(TARGET)
 
@@ -70,8 +78,13 @@ $(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
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+ifeq "$(TOOLCHAIN)" "1"
+	mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)