Mercurial > mxe-octave

diff Makefile.in @ 4967:46f4053aa6a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Attempt to include system pkg config path when when needed * src/qtbase.mk: in native mode, include system pkg config path * Makefile.in: set build pkg config path
author John Donoghue <john.donoghue@ieee.org>
date Sun, 24 Feb 2019 09:18:42 -0500
parents 13d5b82424f7
children 443463cb9e4a
line wrap: on
line diff
--- a/Makefile.in	Mon Feb 25 09:33:23 2019 -0500
+++ b/Makefile.in	Sun Feb 24 09:18:42 2019 -0500
@@ -316,6 +316,19 @@
 
 ENV_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 
+ifeq ($(BUILD_PKG_CONFIG_PATH),)
+  ifeq ($(PKG_CONFIG_PATH),)
+    BUILD_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
+  else
+    ifneq (,$(wildcard /usr/lib/$(subst -pc,,$(BUILD_SYSTEM))))
+      BUILD_PKG_CONFIG_PATH := /usr/lib/$(subst -pc,,$(BUILD_SYSTEM))/pkgconfig
+    else
+      BUILD_PKG_CONFIG_PATH := /usr/lib/pkgconfig
+    endif
+  endif
+  export BUILD_PKG_CONFIG_PATH
+endif
+
 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
   CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'