diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-23 22:09:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-23 22:09:19 +0200 |
| commit | 3a58d6a95405fcb1121860137ace1b136319dcbe (patch) | |
| tree | 5b7d457489862838ad55ec00ab49d1b9154418c3 | |
| parent | 546ec1d75f1760b07d9d6337ba2dd1c4801b4e2d (diff) | |
spkg-install must be before script install logic
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | package/imlib2/Makefile | 2 |
2 files changed, 2 insertions, 2 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}'; \ diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile index 16f6178e9..c2c975908 100644 --- a/package/imlib2/Makefile +++ b/package/imlib2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= imlib2 PKG_VERSION:= 1.4.4 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 20d59c7cda06742015baade6f5975415 PKG_DESCR:= Version 2 of an advanced replacement library for libraries like libXpm PKG_SECTION:= libs |