Cleanup toolchain scripts

[ipfire-2.x.git] / lfs / pkg-config

diff --git a/lfs/pkg-config b/lfs/pkg-config
index fe2752a0dca625af01e3c51083379a49dc90ff1a..3d039ddf28478b630b6033e57bfd1b6fb5af11d3 100644 (file)
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -36,10 +36,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)

-  PREFIX = /usr

 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools

-  PREFIX = $(TOOLS_DIR)

 endif
 
 ###############################################################################
 endif
 
 ###############################################################################


@@ -80,12 +78,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

-ifeq "$(ROOT)" ""
-else
-       mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
-endif

        cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        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)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)