diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/popt | |
parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/popt')
-rw-r--r-- | package/popt/Makefile | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/package/popt/Makefile b/package/popt/Makefile index a72d4de82..c8237930e 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -5,35 +5,28 @@ 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 -PKG_DEPENDS:= libiconv -PKG_BUILDDEP:= libiconv +PKG_BUILDDEP:= libiconv-tiny 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 |