diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:03:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:03:20 +0100 |
| commit | 6daa792eab1488d013fefc5eb7e4d01f40f38687 (patch) | |
| tree | 6391cc46bb9fc8b859d99175ea317e5fa7b37959 /package/xorg-server | |
| parent | adcaca72539b2ff4a5f4deee00d5f0251378ac9b (diff) | |
change defaults for CONFIG/BUILD/INSTALL styles
All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.
I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.
I renamed CONFIGURE_STYLE to CONFIG_STYLE.
Updates for some packages, which have newer upstream versions.
Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 1b604fbe4..35b7597a6 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,8 +9,14 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp libxau libxaw libxmu libxpm libxrender libxt libxxf86dga libxext libxdmcp libxv libsm libice libx11 -PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ + libfontenc xkeyboard-config xkbcomp libxau libxaw \ + libxmu libxpm libxrender libxt libxxf86dga libxext \ + libxdmcp libxv libsm libice libx11 +PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ + scrnsaverproto resourceproto fontsproto videoproto \ + compositeproto evieext libxkbfile libXfont pixman \ + libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} @@ -20,7 +26,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= \ --with-fontdir=/usr/share/fonts/X11 \ @@ -49,12 +54,13 @@ CONFIGURE_ARGS+= \ --with-xkb-output=/tmp \ --with-os-vendor=OpenADK \ --with-vendor-web="http://openadk.org" -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin - $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia} + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ $(IDIR_XORG_SERVER)/usr/lib/xorg/ ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin |