diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 10:26:56 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 10:26:56 +0200 |
commit | 1d6cd4132fa0863213e0aef9a3e6702796776078 (patch) | |
tree | 5613cfbb1f58e8c480659bddaaf42a4d87316b8c /mk | |
parent | 394927e73c8b93754e3b841e5b8aefbde81c5143 (diff) | |
parent | 9e2de8dc3d63c1ba795ca96d98d1272582e441fb (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to '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}'; \ |