diff options
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_build.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_configure.subr | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index 4c1b41eb..3f1fa270 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -19,9 +19,8 @@ pkg_build() { "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \ "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}"\ - "${PKG_PKGCONFIG:+PKGCONFIG=${PKG_PKGCONFIG}}" \ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ - "${PKG_PKG_CONFIG_LIBPATH:+PKG_CONFIG_LIBPATH=${PKG_PKG_CONFIG_LIBPATH}}"\ + "${PKG_PKG_CONFIG_PATH:+PKG_CONFIG_PATH=${PKG_PKG_CONFIG_PATH}}"\ "LIBTOOL=${PKG_LIBTOOL:-slibtool}"; }; diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index e94810d6..de6fd494 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -4,14 +4,11 @@ pkg_configure() { if [ -x "${PKG_CONFIGURE}" ]; then - if [ -n "${PKG_PKGCONFIG}" ]; then - export PKGCONFIG="${PKG_PKGCONFIG}"; - fi; if [ -n "${PKG_PKG_CONFIG}" ]; then export PKG_CONFIG="${PKG_PKG_CONFIG}"; fi; - if [ -n "${PKG_PKG_CONFIG_LIB_PATH}" ]; then - export PKG_CONFIG_LIBPATH="${PKG_PKG_CONFIG_LIBPATH}"; + if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then + export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; fi; if [ -n "${PKG_PYTHON}" ]; then export PYTHON="${PKG_PYTHON}"; @@ -25,7 +22,7 @@ pkg_configure() { LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ ${PKG_CONFIGURE} \ ${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG}; - unset PKGCONFIG PKG_CONFIG PKG_CONFIG_LIBPATH PYTHON; + unset PKG_CONFIG PKG_CONFIG_PATH PYTHON; fi; }; |