diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-23 14:45:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-23 14:45:40 +0200 |
| commit | 22277d5d907ee371411382491ee98ceb473416fe (patch) | |
| tree | 2f1108f4fdd7b1e28a2e31dbffae5d1668bc4944 /package/popt | |
| parent | bf89ff6c79e76b23d153cead09754e68dbe59983 (diff) | |
| parent | abbe92443043e4ea376870b8e921f326bee72a51 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/popt')
| -rw-r--r-- | package/popt/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/package/popt/Makefile b/package/popt/Makefile index 2c355dbfb..aead00fe5 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:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs @@ -14,7 +14,8 @@ PKG_BUILDDEP:= libiconv PKG_URL:= http://rpm5.org/ PKG_SITES:= http://rpm5.org/files/popt/ -PKG_SUBPKGS:= LIBPOPT +PKG_SUBPKGS:= LIBPOPT LIBPOPT_DEV +PKGSC_LIBPOPT_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,9 +24,16 @@ 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_LDFAGS+= -liconv post-install: ${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpopt.so* ${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 |