summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-03-01 10:07:11 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2011-03-01 10:07:11 +0000
commit3463e05ae25800910ca9f450f2529333284820f7 (patch)
tree569cd478d6e4e7314a633970c478398b46753f32 /x11-base/xorg-server
parentsys-kernel/dracut-007: Added dependency on >=baselayout-1.12.14-r1 (diff)
downloadgentoo-2-3463e05ae25800910ca9f450f2529333284820f7.tar.gz
gentoo-2-3463e05ae25800910ca9f450f2529333284820f7.tar.bz2
gentoo-2-3463e05ae25800910ca9f450f2529333284820f7.zip
Fix installation of xorg.conf.example
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.9.4.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b0ebc1b05af7..5d4b5a9a60bc 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.567 2011/02/23 16:31:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.568 2011/03/01 10:07:11 chithanh Exp $
+
+ 01 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-server-1.9.4.ebuild:
+ Fix installation of xorg.conf.example
23 Feb 2011; Jeroen Roovers <jer@gentoo.org> xorg-server-1.9.4.ebuild:
Stable for HPPA (bug #354237).
diff --git a/x11-base/xorg-server/xorg-server-1.9.4.ebuild b/x11-base/xorg-server/xorg-server-1.9.4.ebuild
index 6144aad54bef..59e6837214ba 100644
--- a/x11-base/xorg-server/xorg-server-1.9.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.4.ebuild,v 1.5 2011/02/23 16:31:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.4.ebuild,v 1.6 2011/03/01 10:07:11 chithanh Exp $
EAPI=3
inherit xorg-2 multilib versionator
@@ -195,7 +195,7 @@ src_install() {
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
- dodoc hw/xfree86/xorg.conf.example \
+ dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \
|| die "couldn't install xorg.conf.example"
fi