diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-06-19 23:12:22 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-06-19 23:12:22 +0000 |
| commit | 7ff495b273c2d7ca840096e8da0ec53921bb80a4 (patch) | |
| tree | d1b1b12863845ce7f611116a8338b966fa7ef445 /x11-base | |
| parent | Fixes #53829. (Manifest recommit) (diff) | |
| download | gentoo-2-7ff495b273c2d7ca840096e8da0ec53921bb80a4.tar.gz gentoo-2-7ff495b273c2d7ca840096e8da0ec53921bb80a4.tar.bz2 gentoo-2-7ff495b273c2d7ca840096e8da0ec53921bb80a4.zip | |
Move how font directories are defined into a host.def setting.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 60a57a3de47f..b39dc55130b6 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.60 2004/06/16 16:13:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.61 2004/06/19 23:12:22 spyderous Exp $ + + 19 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.7.0-r1.ebuild: + Move how font directories are defined into a host.def setting. 16 Jun 2004; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.7.0-r1.ebuild: Marked ppc for security reason, see Bug #53226 diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild index 22a320288893..5383a69c9f85 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.13 2004/06/16 19:59:46 jhuebel Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.14 2004/06/19 23:12:22 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -260,6 +260,7 @@ host_def_setup() { # FHS install locations for docs echo "#define ManDirectoryRoot /usr/share/man" >> config/cf/host.def echo "#define DocDir /usr/share/doc/${PF}" >> config/cf/host.def + echo "#define FontDir /usr/share/fonts" >> config/cf/host.def # Make man4 and man7 stuff get 'x' suffix like everything else # Necessary so we can install to /usr/share/man without overwriting @@ -699,7 +700,7 @@ src_compile() { unset MAKE_OPTS einfo "Building xorg-x11..." - FAST=1 emake World WORLDOPTS="" FONTDIR="/usr/share/fonts" || die + FAST=1 emake World WORLDOPTS="" || die if use nls then @@ -945,12 +946,12 @@ src_install() { # whole build will not be compiled without mmx instructions. if [ "`gcc-version`" != "2.95" ] && use x86 then - make install DESTDIR=${D} FONTDIR="/usr/share/fonts" || \ + make install DESTDIR=${D} || \ make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} FONTDIR="/usr/share/fonts" || die + install DESTDIR=${D} || die else - make install DESTDIR=${D} FONTDIR="/usr/share/fonts" || die + make install DESTDIR=${D} || die fi if use sdk # || use gatos |