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/libXfont | |
parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) |
resolve xterm Makefile conflict
Diffstat (limited to 'package/libXfont')
-rw-r--r-- | package/libXfont/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 0122fb89a..092155f91 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -13,14 +13,24 @@ PKG_DEPENDS:= libfreetype PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXFONT LIBXFONT_DEV +PKGSD_LIBXFONT_DEV:= X font headers +PKGSC_LIBXFONT_DEV:= x11/devel + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXFONT_DEV,libxfont-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFONT_DEV},${PKGSC_LIBXFONT_DEV})) CONFIGURE_ENV+= ac_cv_path_XMLTO=true -post-install: +libxfont-install: ${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib + +libxfont-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xfont.pc \ + ${IDIR_LIBXFONT_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk |