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/libxcb | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/libxcb')
| -rw-r--r-- | package/libxcb/Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 5684df06b..b854a4b4f 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -14,14 +14,14 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXCB LIBXCB_DEVEL -PKGSD_LIBXCB_DEVEL:= XML-XCB protocol headers -PKGSS_LIBXCB_DEVEL:= libxcb -PKGSC_LIBXCB_DEVEL:= x11/devel +PKGSD_LIBXCB_DEV:= XML-XCB protocol headers +PKGSS_LIBXCB_DEV:= libxcb +PKGSC_LIBXCB_DEV:= x11/devel include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXCB_DEVEL,${PKG_NAME}-devel,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEVEL},${PKGSD_LIBXCB_DEVEL},${PKGSC_LIBXCB_DEVEL})) +$(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEV},${PKGSD_LIBXCB_DEV},${PKGSC_LIBXCB_DEV})) include $(TOPDIR)/mk/python.mk @@ -31,8 +31,11 @@ libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib ${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib/ -libxcb-devel-install: - ${INSTALL_DIR} ${IDIR_LIBXCB_DEVEL}/usr/include - ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEVEL}/usr/include +libxcb-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk |