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/libXinerama | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXinerama')
| -rw-r--r-- | package/libXinerama/Makefile | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile index 2a6f7d737..2f7e2f848 100644 --- a/package/libXinerama/Makefile +++ b/package/libXinerama/Makefile @@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXinerama PKG_VERSION:= 1.1.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 29a813b3850d499a3524a8d5d5ecb099 PKG_DESCR:= Xinerama library PKG_SECTION:= x11/libs PKG_BUILDDEP:= xineramaproto PKG_SITES:= ${MASTER_SITE_XORG} - -PKG_SUBPKGS:= LIBXINERAMA LIBXINERAMA_DEV -PKGSD_LIBXINERAMA_DEV:= Xinerama headers -PKGSC_LIBXINERAMA_DEV:= x11/devel +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXINERAMA_DEV,libxinerama-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXINERAMA_DEV},${PKGSC_LIBXINERAMA_DEV})) +$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-malloc0returnsnull @@ -27,11 +23,4 @@ libxinerama-install: ${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib ${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib -libxinerama-dev-install: - ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXINERAMA_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk |