From 90d5c8b73e8d538e121275b12e714332ca785cff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 17:20:24 +0200
Subject: automatically create development subpackages, without user
 interaction, depend on gcc for the target, simplifies a lot of library
 packages

---
 package/popt/Makefile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'package/popt')

diff --git a/package/popt/Makefile b/package/popt/Makefile
index a72d4de82..398aeae38 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		popt
 PKG_VERSION:=		1.16
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		3743beefa3dd6247a73f8f7a32c14c33
 PKG_DESCR:=		a command line option parsing library
 PKG_SECTION:=		libs
@@ -13,27 +13,21 @@ PKG_DEPENDS:=		libiconv
 PKG_BUILDDEP:=		libiconv
 PKG_URL:=		http://rpm5.org/
 PKG_SITES:=		http://rpm5.org/files/popt/
-
-PKG_SUBPKGS:=		LIBPOPT LIBPOPT_DEV
-PKGSC_LIBPOPT_DEV:=	devel
+PKG_LIBNAME:=		libpopt
+PKG_OPTS:=		dev
 
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS:=		libonly
+PKG_OPTS+=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPOPT_DEV,libpopt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPOPT_DEV},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-liconv
 
-post-install:
+libpopt-install:
 	${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib
 
-libpopt-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBPOPT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPOPT_DEV}/usr/include
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3