summaryrefslogtreecommitdiff
path: root/package/font-util
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-02-24 17:41:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-02-24 17:41:36 +0100
commit0aabef127155575e8c8d660605f9401ab15356aa (patch)
treeb8cd5f06c60cd4e95fd7a2923dabb3b831dd93b3 /package/font-util
parent0b09c2710166bd95ac9033b048bb6cbf7b4de7c2 (diff)
allow native build of a lot of packages
STAGING_TARGET_DIR is used for package Makefile's for include and library search path's. STAGING_DIR is used for common code in mk/ or Makefile/rules.mk. STAGING_TARGET_DIR is /usr when native builds are used.
Diffstat (limited to 'package/font-util')
-rw-r--r--package/font-util/Makefile23
1 files changed, 18 insertions, 5 deletions
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index e71db6670..8d8c37e13 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -5,16 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= font-util
PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
PKG_DESCR:= font util
PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SUBPKGS:= FONT_UTIL FONT_UTIL_DEV
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
# XXX: Push the mapping files to a place where we can find them
# again when compiling the actual fonts. This is ugly as hell,
@@ -22,13 +25,23 @@ $(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
# calling pkg-config (which we don't provide) in order to
# automatically find the mappings.
fonts-hack:
- ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
+ ${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
- ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
+ ${STAGING_DIR}/usr/share/fonts/X11/util
-post-install: fonts-hack
+font-util-install: fonts-hack
+ ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/ucs2any \
+ ${IDIR_FONT_UTIL}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/bdftruncate \
+ ${IDIR_FONT_UTIL}/usr/bin
${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
+font-util-dev-install:
+ ${INSTALL_DIR} ${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fontutil.pc \
+ ${IDIR_FONT_UTIL_DEV}/usr/lib/pkgconfig
+
include ${TOPDIR}/mk/pkg-bottom.mk