diff options
| author | Treeve Jelbert | 2018-06-01 11:07:07 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2018-07-12 11:29:45 +0200 |
| commit | 65e1a75b89417e27817932d743804a564bc48a91 (patch) | |
| tree | 26931608bbb9b92fabbdc878fc4eb0590ae274f4 /xorg/xserver | |
| parent | d94d548e5a5dfbcbfe81602a889f710860869ae8 (diff) | |
xserver - now a viable alternative to xorg-server
Diffstat (limited to 'xorg/xserver')
| -rwxr-xr-x | xorg/xserver/BUILD | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | xorg/xserver/CONFLICTS | 0 | ||||
| -rw-r--r-- | xorg/xserver/HISTORY | 5 | ||||
| -rwxr-xr-x | xorg/xserver/INSTALL | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD index 8dfc0184bc..ba0c526ad1 100755 --- a/xorg/xserver/BUILD +++ b/xorg/xserver/BUILD @@ -9,8 +9,7 @@ OPTS+=" xorg=$XSERVER_XORG \ log_dir=${INSTALL_ROOT}/var/log \ xkb_bin_dir=$INSTALL_ROOT/usr/bin \ os_vendor='SourceMage'" -PREFIX=/opt/xorg && -#PREFIX=/usr && +PREFIX=/usr && check_tmp_noexec /tmp && default_build && check_tmp_noexec /tmp diff --git a/xorg/xserver/CONFLICTS b/xorg/xserver/CONFLICTS index 39994f510a..39994f510a 100644..100755 --- a/xorg/xserver/CONFLICTS +++ b/xorg/xserver/CONFLICTS diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY index f744891262..1ca658720c 100644 --- a/xorg/xserver/HISTORY +++ b/xorg/xserver/HISTORY @@ -1,3 +1,8 @@ +2018-06-01 Treeve Jelbert <treeve@sourcemage.org> + * BUILD INSTALL: install to /usr + * CONFLICTS: activated + this spell is now a viable alternative to xorg-server + 2018-05-10 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 1.20.0 * BUILD: removed module_dir option, defaults are fine now diff --git a/xorg/xserver/INSTALL b/xorg/xserver/INSTALL index 0fe29c645b..7690a69964 100755 --- a/xorg/xserver/INSTALL +++ b/xorg/xserver/INSTALL @@ -1,6 +1,6 @@ default_install && # most drivers and applications reference X -PREFIX=/opt/xorg && +PREFIX=/usr && if [[ ${XSERVER_XORG} == 'true' ]];then TGT=${TRACK_ROOT}${PREFIX}/bin && FROM=${INSTALL_ROOT}${PREFIX}/bin && |