diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-03-27 12:05:46 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-03-29 10:24:42 +0300 |
| commit | 48b4b9f2d26e8e331f3ab768dd4a70a1fd82ecd0 (patch) | |
| tree | 39bdf6e93736c18bcffcddd2fb05216f9bf58ded /data | |
| parent | cbf92b3a9673ca310ce0d2feb4e3673eb4eaae0a (diff) | |
ndk-build: Rename HOST_PKG_CONFIG to PKG_CONFIG_PATH
The HOST_ variables are from ndk-build and we should not add our own in there,
it will only cause confusion.
https://bugzilla.gnome.org/show_bug.cgi?id=763999
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/tools.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/ndk-build/tools.mk b/data/ndk-build/tools.mk index 5aa46889..7f1a836d 100644 --- a/data/ndk-build/tools.mk +++ b/data/ndk-build/tools.mk @@ -23,13 +23,13 @@ # Make pkg-config relocatable # set PKG_CONFIG_LIBDIR and override the prefix and libdir variables ifeq ($(HOST_OS),windows) - HOST_PKG_CONFIG := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/pkg-config + PKG_CONFIG_PATH := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/pkg-config # No space before the &&, or it will be added to PKG_CONFIG_LIBDIR - PKG_CONFIG_ORIG := set PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig&& $(HOST_PKG_CONFIG) + PKG_CONFIG_ORIG := set PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig&& $(PKG_CONFIG_PATH) GSTREAMER_ROOT := $(subst \,/,$(GSTREAMER_ROOT)) else - HOST_PKG_CONFIG := pkg-config - PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig $(HOST_PKG_CONFIG) + PKG_CONFIG_PATH := pkg-config + PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig $(PKG_CONFIG_PATH) endif PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_ROOT) --define-variable=libdir=$(GSTREAMER_ROOT)/lib |