summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-10-10 15:10:24 +0000
committerUlrich Müller <ulm@gentoo.org>2010-10-10 15:10:24 +0000
commit846d9d4bfed9f12f87bccda1638debcf94cb29a0 (patch)
tree9409ee24cc0e227ba73b486314c28f5edf1c8e85 /app-editors
parentclean up (diff)
downloadgentoo-2-846d9d4bfed9f12f87bccda1638debcf94cb29a0.tar.gz
gentoo-2-846d9d4bfed9f12f87bccda1638debcf94cb29a0.tar.bz2
gentoo-2-846d9d4bfed9f12f87bccda1638debcf94cb29a0.zip
Fix path for installation of Info dir.
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/emacs-21.4-r21.ebuild15
2 files changed, 10 insertions, 10 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 599d6e3d118a..adccd05e5a53 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.385 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.386 2010/10/10 15:10:24 ulm Exp $
+
+ 10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r21.ebuild:
+ Fix path for installation of Info dir.
*emacs-23.2-r1 (25 Sep 2010)
*emacs-22.3-r5 (25 Sep 2010)
diff --git a/app-editors/emacs/emacs-21.4-r21.ebuild b/app-editors/emacs/emacs-21.4-r21.ebuild
index f77c6122e05a..893b76fa6ee0 100644
--- a/app-editors/emacs/emacs-21.4-r21.ebuild
+++ b/app-editors/emacs/emacs-21.4-r21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.1 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.2 2010/10/10 15:10:24 ulm Exp $
EAPI=2
@@ -111,7 +111,9 @@ src_compile() {
src_install() {
local i m
- einstall || die "einstall failed"
+ einstall infodir="${D}/usr/share/info/emacs-${SLOT}" \
+ || die "einstall failed"
+
for i in "${D}"/usr/bin/* ; do
mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
done
@@ -119,14 +121,9 @@ src_install() {
rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
# move info documentation to the correct place
- mkdir "${T}/emacs-${SLOT}"
- mv "${D}/usr/share/info/dir" "${T}"
- for i in "${D}"/usr/share/info/*
- do
- mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
+ for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+ mv "${i}" "${i}.info" || die "mv ${i} failed"
done
- mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
- mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
# move man pages to the correct place
for m in "${D}"/usr/share/man/man1/* ; do