diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 07:20:07 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 07:20:07 +0200 |
commit | 5823d3b2798d4e8de44a0b81b1cdfd4ea801e3aa (patch) | |
tree | c766e46b281828184e302bda791f1e5f475fdc6e /mk/pkg-bottom.mk | |
parent | 85898f9ef5d6ead12220bbcf66e1e6ebad0fa9d8 (diff) | |
parent | 3a58d6a95405fcb1121860137ace1b136319dcbe (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/pkg-bottom.mk')
-rw-r--r-- | mk/pkg-bottom.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 1a35599fd..c3bf0b848 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -143,6 +143,7 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif + env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts' @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ @@ -158,7 +159,6 @@ endif sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \ ${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \ done - env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ |