diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-07-29 19:56:22 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-07-29 19:56:22 +0000 |
| commit | 138336c317500f7fc6d66a8673fb95ed52ed6cb1 (patch) | |
| tree | 630e2f66f51c608ee52d5094314e1d244732b68a | |
| parent | fixed some typos (diff) | |
| download | gentoo-2-138336c317500f7fc6d66a8673fb95ed52ed6cb1.tar.gz gentoo-2-138336c317500f7fc6d66a8673fb95ed52ed6cb1.tar.bz2 gentoo-2-138336c317500f7fc6d66a8673fb95ed52ed6cb1.zip | |
bug #5684
| -rw-r--r-- | x11-base/xfree/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r12/xinitrc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 11011108c687..920d4ff53413 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.33 2002/07/29 03:51:11 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.34 2002/07/29 19:56:22 azarah Exp $ 29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : Fixes for gcc-3.x and also fixes that should resolve bug #5613. + Update /etc/X11/xinit/xinitrc ($FILESDIR/4.2.0-r12/xinitrc) to point + to the proper place for system wide resources. Bug #5684. + 17 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : Make sure the standard symlinks (/usr/include/X11, etc) will not be removed. diff --git a/x11-base/xfree/files/4.2.0-r12/xinitrc b/x11-base/xfree/files/4.2.0-r12/xinitrc index 9a669469a542..f81157d11fd1 100644 --- a/x11-base/xfree/files/4.2.0-r12/xinitrc +++ b/x11-base/xfree/files/4.2.0-r12/xinitrc @@ -3,8 +3,9 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=XINITDIR/.Xresources -sysmodmap=XINITDIR/.Xmodmap +XINITDIR=/usr/X11R6/lib/X11/xinit +sysresources=$XINITDIR/.Xresources +sysmodmap=$XINITDIR/.Xmodmap # merge in defaults and keymaps |