From cd22ecf2f00456b8050b74544afa029f8a2e9b49 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Oct 2020 00:44:08 +0800 Subject: improve autoconf --- xmake/modules/package/tools/autoconf.lua | 4 ++++ xmake/modules/package/tools/make.lua | 4 ++++ xmake/modules/package/tools/meson.lua | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 48e219e13..36853ace1 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -153,6 +153,10 @@ function buildenvs(package) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + pkgconfig = path.join(dep:installdir(), "share", "pkgconfig") + if os.isdir(pkgconfig) then + table.insert(PKG_CONFIG_PATH, pkgconfig) + end local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua index 8b7cebe6b..ce1882407 100644 --- a/xmake/modules/package/tools/make.lua +++ b/xmake/modules/package/tools/make.lua @@ -64,6 +64,10 @@ function buildenvs(package) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + pkgconfig = path.join(dep:installdir(), "share", "pkgconfig") + if os.isdir(pkgconfig) then + table.insert(PKG_CONFIG_PATH, pkgconfig) + end local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 176730ff0..fc4a2a1ae 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -73,6 +73,10 @@ function buildenvs(package) if os.isdir(pkgconfig) then table.insert(PKG_CONFIG_PATH, pkgconfig) end + pkgconfig = path.join(dep:installdir(), "share", "pkgconfig") + if os.isdir(pkgconfig) then + table.insert(PKG_CONFIG_PATH, pkgconfig) + end local aclocal = path.join(dep:installdir(), "share", "aclocal") if os.isdir(aclocal) then table.insert(ACLOCAL_PATH, aclocal) -- cgit v1.3.1