diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /package/libupnp | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/libupnp')
| -rw-r--r-- | package/libupnp/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 7e4c59366..98f9aca9b 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -13,11 +13,14 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://pupnp.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pupnp/} +PKG_SUBPKGS:= LIBUPNP LIBUPNP_DEV + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBUPNP_DEV,libupnp-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-samples @@ -26,8 +29,12 @@ post-build: sed -i -e 's#^libdir=.*#libdir=#' \ ${WRKBUILD}/threadutil/libthreadutil.la -post-install: +libupnp-install: ${INSTALL_DIR} ${IDIR_LIBUPNP}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBUPNP}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBUPNP}/usr/lib + +libupnp-dev-install: + ${INSTALL_DIR} ${IDIR_LIBUPNP_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBUPNP_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk |