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/libxkbfile | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/libxkbfile')
| -rw-r--r-- | package/libxkbfile/Makefile | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 2dc277b09..a2de15f21 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -12,12 +12,25 @@ PKG_SECTION:= x11/libs PKG_BUILDDEP:= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXKBFILE LIBXKBFILE_DEV +PKGSD_LIBXKBFILE_DEV:= X11 keyboard configuration extension headers +PKGSC_LIBXKBFILE_DEV:= devel + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXKBFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXKBFILE_DEV,libxkbfile-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXKBFILE_DEV},${PKGSC_LIBXKBFILE_DEV})) -post-install: +libxkbfile-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib + +libxkbfile-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_LIBXKBFILE_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig + ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xkbfile.pc \ + ${IDIR_LIBXKBFILE_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk |