summaryrefslogtreecommitdiff
path: root/package/libXtst
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
commit8e8512391c668fc7074f812f15eabe8f176fb01e (patch)
treef9f0862dd6eb962fe3fc4803180b431843f6c5be /package/libXtst
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXtst')
-rw-r--r--package/libXtst/Makefile18
1 files changed, 4 insertions, 14 deletions
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index 1b288e8ca..5a9c07704 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -5,21 +5,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXtst
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b
PKG_DESCR:= Xtst library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= recordproto libXi
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXTST LIBXTST_DEV
-PKGSD_LIBXTST_DEV:= Xtst headers
-PKGSC_LIBXTST_DEV:= x11/devel
+PKG_LIBNAME:= libxtst
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXTST_DEV,libxtst-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXTST_DEV},${PKGSC_LIBXTST_DEV}))
+$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -27,11 +24,4 @@ libxtst-install:
${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
-libxtst-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXTST_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk