diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
| commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
| tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/libXfont | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXfont')
| -rw-r--r-- | package/libXfont/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 10bd5c9a3..52a35c7b5 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -5,22 +5,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXfont PKG_VERSION:= 1.4.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a54dea0debecf232a346c22e71d76836 PKG_DESCR:= X font Library PKG_SECTION:= x11/libs 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 +PKG_OPTS:= dev 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})) +$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= ac_cv_path_XMLTO=true @@ -28,12 +24,4 @@ libxfont-install: ${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXfont.so* ${IDIR_LIBXFONT}/usr/lib -libxfont-dev-install: - ${INSTALL_DIR} ${IDIR_LIBXFONT_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_LIBXFONT_DEV}/usr/include - ${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 |