From 73cb70eb9a1505040a76e2f1d671c873ef096f18 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Wed, 25 Nov 2009 21:53:41 +0000
Subject: Prepare for Prefix support.

svn path=/emacs-overlay/; revision=1477
---
 eclass/elisp-common.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'eclass/elisp-common.eclass')

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 99a58c5..54390ac 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -143,7 +143,7 @@ SITEETC=/usr/share/emacs/etc
 # @ECLASS-VARIABLE: EMACS
 # @DESCRIPTION:
 # Path of Emacs executable.
-EMACS=/usr/bin/emacs
+EMACS=${EPREFIX}/usr/bin/emacs
 
 # @ECLASS-VARIABLE: EMACSFLAGS
 # @DESCRIPTION:
@@ -261,8 +261,8 @@ elisp-site-file-install() {
 	ebegin "Installing site initialisation file for GNU Emacs"
 	[[ $1 = ${sf} ]] || cp "$1" "${sf}"
 	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
-		-e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
-		-e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
+		-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
+		-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g;\$q" "${sf}"
 	( # subshell to avoid pollution of calling environment
 		insinto "${SITELISP}/site-gentoo.d"
 		doins "${sf}"
@@ -283,7 +283,7 @@ elisp-site-file-install() {
 # location is still supported when generating site-gentoo.el.
 
 elisp-site-regen() {
-	local sitelisp=${ROOT}${SITELISP}
+	local sitelisp=${ROOT}${EPREFIX}${SITELISP}
 	local sf i line null="" page=$'\f'
 	local -a sflist
 
-- 
cgit v1.2.3-65-gdbad