From 163b7e51f5dba02aa640ce933976719c7b8018d5 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Thu, 6 Jan 2011 20:36:50 +0000
Subject: automatic post-postinstall targets, and exemplary switch of zlib to
 it

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/package.mk         | 2 ++
 mk/pkg-bottom.mk      | 2 ++
 package/zlib/Makefile | 6 +-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/package.mk b/mk/package.mk
index edbf3c6d5..fb66a0aaf 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -142,6 +142,8 @@ IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
 ALL_IPKGS+=	$$(IPKG_$(1))
 ALL_IDIRS+=	$${IDIR_$(1)}
+ALL_POSTINST+=	$(2)-install
+$(2)-install:
 endif
 INFO_$(1)=	$(PKG_STATE_DIR)/info/$(2).list
 
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 122198e45..6e5fdc3a5 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -127,6 +127,7 @@ endif
 pre-install:
 do-install:
 post-install:
+spkg-install: ${ALL_POSTINST}
 ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
 	-rm -f ${_ALL_CONTROLS}
 	@mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_TARGET_DIR}/scripts'
@@ -145,6 +146,7 @@ else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
 endif
+	env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE)
 ifeq ($(ADK_NATIVE),)
 	@for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
 		[[ -e $$a ]] || continue; \
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 0bf048448..6270eaf37 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -27,10 +27,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZLIB_DEV},${PKGSC_ZLIB_DEV}))
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+=	zlib-dev-install
-
 CONFIG_STYLE:=		manual
 CONFIGURE_ENV+=		uname=Linux
 
@@ -53,7 +49,7 @@ do-configure:
 		$(CONFIGURE_OPTS) \
 	);
 
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
 	${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
 
-- 
cgit v1.2.3