diff options
| author |   Martin Väth <martin@mvath.de> | 2014-01-24 00:29:50 +0100 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:49:06 +0200 |
| commit | e078c9f11b5c619e1f10e6feb4235a4a2778ab75 (patch) | |
| tree | 3b1910f03ce66e24aa3e8aa54fe03804ebd88033 /x11-themes/fvwm-crystal | |
| parent | Bump fvwm-crystal (diff) | |
| download | mv-e078c9f11b5c619e1f10e6feb4235a4a2778ab75.tar.gz mv-e078c9f11b5c619e1f10e6feb4235a4a2778ab75.tar.bz2 mv-e078c9f11b5c619e1f10e6feb4235a4a2778ab75.zip | |
Avoid duplicate installations
Diffstat (limited to 'x11-themes/fvwm-crystal')
| -rw-r--r-- | x11-themes/fvwm-crystal/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog index 54c35f1c..08fb6a04 100644 --- a/x11-themes/fvwm-crystal/ChangeLog +++ b/x11-themes/fvwm-crystal/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*fvwm-crystal-3.3.0-r1 (24 Jan 2014) + + 24 Jan 2014; Martin Väth <martin@mvath.de>: + Do not install duplicate into /usr/local. Honour $EPREFIX + *fvwm-crystal-3.3.0 (23 Jan 2014) 23 Jan 2014; Martin Väth <martin@mvath.de>: diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild index 0c27c2b1..9ca607a3 100644 --- a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild +++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild @@ -45,18 +45,19 @@ To know how to update your custom color themes, please run ${ROOT}usr/share/${PN}/addons/convert_colorsets" src_prepare() { + sed -i -e 's!/usr/local!${EPREFIX%/}/usr!' -- "${S}/Makefile" epatch_user } src_install() { emake \ DESTDIR="${D}" \ - docdir="/usr/share/doc/${PF}" \ - prefix="/usr" \ + docdir="${EPREFIX%/}/usr/share/doc/${PF}" \ + prefix="${EPREFIX%/}/usr" \ install python_replicate_script \ - "${D}/usr/bin/${PN}".{apps,wallpaper} \ - "${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py - readme.gentoo_src_install + "${ED}/usr/bin/${PN}".{apps,wallpaper} \ + "${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py + readme.gentoo_create_doc } |