summaryrefslogtreecommitdiff
path: root/package/libX11/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/libX11/Makefile')
-rw-r--r--package/libX11/Makefile17
1 files changed, 3 insertions, 14 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index beabb3201..3a27d724e 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libX11
PKG_VERSION:= 1.5.0
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 395455e4d3a51459374fe5ca8420aae8
PKG_DESCR:= X11 client-side library
PKG_SECTION:= x11/libs
@@ -13,19 +13,15 @@ PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcb-proto
PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb
PKG_DEPENDS:= libxdmcp libxcb libxau
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBX11 LIBX11_DEV
-PKGSD_LIBX11_DEV:= X11 headers
-PKGSC_LIBX11_DEV:= x11/devel
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-xlocale \
--disable-specs \
@@ -39,11 +35,4 @@ libx11-install:
${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
-libx11-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
- ${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11
- ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBX11_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk