diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
| commit | db40ed98b297d0550c6971b096c87bf0debf59b1 (patch) | |
| tree | 39bb950b98c4ca6292ce2850cd889c9ca1fd9eb6 /package/libX11/Makefile | |
| parent | 45805efcda653a3e6d7577ac2956c8138b49c7fc (diff) | |
| parent | 83e2707a887a4c495a42f7e59f9f332df6b759ab (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libX11/Makefile')
| -rw-r--r-- | package/libX11/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 4d7e7794e..153a08f12 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -5,14 +5,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.3.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto +PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau +PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBX11 LIBX11_DEV +PKGSD_LIBX11_DEV:= X11 headers +PKGSC_LIBX11_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -21,7 +24,7 @@ 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},${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})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= @@ -42,7 +45,5 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} libx11-dev-install: ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11 ${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11 - ${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \ - ${IDIR_LIBX11_DEV}/usr/include/X11 include ${TOPDIR}/mk/pkg-bottom.mk |