summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-23 22:09:19 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-23 22:09:19 +0200
commit3a58d6a95405fcb1121860137ace1b136319dcbe (patch)
tree5b7d457489862838ad55ec00ab49d1b9154418c3 /mk
parent546ec1d75f1760b07d9d6337ba2dd1c4801b4e2d (diff)
spkg-install must be before script install logic
Diffstat (limited to 'mk')
-rw-r--r--mk/pkg-bottom.mk2
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}'; \