diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-04-10 14:45:08 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-04-10 14:45:08 (GMT) |
| commit | b761bc9bcb4ab533f2978903fb53299b7050081f (patch) | |
| tree | aebe330a580402736d77c8537d14411d3c254bf5 | |
| parent | e62b7438fd5133bab1e2386b60bbdd02f5bae899 (diff) | |
| download | mxe-b761bc9bcb4ab533f2978903fb53299b7050081f.zip mxe-b761bc9bcb4ab533f2978903fb53299b7050081f.tar.gz mxe-b761bc9bcb4ab533f2978903fb53299b7050081f.tar.bz2 | |
package pkgconf: remove symlink to pkg-config and invoke pkgconf directly in wrapper script
| -rw-r--r-- | src/pkgconf.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pkgconf.mk b/src/pkgconf.mk index d7791ee..cf5de8a 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -29,7 +29,6 @@ define $(PKG)_BUILD_COMMON --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - ln -sf '$(PREFIX)/$(TARGET)/bin/pkgconf' '$(PREFIX)/$(TARGET)/bin/pkg-config' # install target-specific autotools config file $(INSTALL) -d '$(PREFIX)/$(TARGET)/share' @@ -41,7 +40,7 @@ define $(PKG)_BUILD_COMMON # create pkg-config script (echo '#!/bin/sh'; \ - echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(TARGET)/bin/pkg-config' $(if $(BUILD_STATIC),--static) "$$@"') \ + echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec '$(PREFIX)/$(TARGET)/bin/pkgconf' $(if $(BUILD_STATIC),--static) "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' |