diff options
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | package/imlib2/Makefile | 6 |
2 files changed, 4 insertions, 4 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 c1c4c4e6d..c2c975908 100644 --- a/package/imlib2/Makefile +++ b/package/imlib2/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= imlib2 PKG_VERSION:= 1.4.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_MD5SUM:= 20d59c7cda06742015baade6f5975415 PKG_DESCR:= Version 2 of an advanced replacement library for libraries like libXpm PKG_SECTION:= libs -PKG_DEPENDS:= libfreetype zlib libpng libtiff -PKG_BUILDDEP:= freetype zlib libpng libtiff +PKG_DEPENDS:= libfreetype zlib libpng libtiff libx11 libxext +PKG_BUILDDEP:= freetype zlib libpng libtiff libX11 libXext PKG_URL:= http://www.enlightenment.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} PKG_OPTS:= dev |