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/libXft | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/libXft')
| -rw-r--r-- | package/libXft/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/package/libXft/Makefile b/package/libXft/Makefile index ea477afaa..50f3fc68d 100644 --- a/package/libXft/Makefile +++ b/package/libXft/Makefile @@ -12,15 +12,24 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXrender PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXFT LIBXFT_DEV +PKGSD_LIBXFT_DEV:= X FreeType headers +PKGSC_LIBXFT_DEV:= x11/devel + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV})) CONFIGURE_ARGS+= --disable-malloc0returnsnull \ --disable-install-makestrs -post-install: +libxft-install: ${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib + +libxft-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk |