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/freetype | |
parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) |
resolve xterm Makefile conflict
Diffstat (limited to 'package/freetype')
-rw-r--r-- | package/freetype/Makefile | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 913f99d52..fa0488195 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -14,7 +14,9 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.freetype.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} -PKG_SUBPKGS:= LIBFREETYPE +PKG_SUBPKGS:= LIBFREETYPE LIBFREETYPE_DEV +PKGSD_LIBFREETYPE_DEV:= FreeType headers +PKGSC_LIBFREETYPE_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,9 +25,20 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBFREETYPE_DEV,libfreetype-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFREETYPE_DEV},${PKGSC_LIBFREETYPE_DEV},${PKG_OPTS})) -post-install: +libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib + +libfreetype-dev-install: + ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFREETYPE_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/freetype2.pc \ + ${IDIR_LIBFREETYPE_DEV}/usr/lib/pkgconfig + ${INSTALL_DIR} ${IDIR_LIBFREETYPE_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/freetype-config \ + ${IDIR_LIBFREETYPE_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk |