diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-11-25 21:53:41 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-11-25 21:53:41 +0000 |
| commit | 73cb70eb9a1505040a76e2f1d671c873ef096f18 (patch) | |
| tree | 0510ba04c7ba22e8abc7202cf8ce04a83abd09a5 /eclass/elisp-common.eclass | |
| parent | Change all occurences of ${ROOT}${SITELISP} to ${sitelisp}. (diff) | |
| download | emacs-73cb70eb9a1505040a76e2f1d671c873ef096f18.tar.gz emacs-73cb70eb9a1505040a76e2f1d671c873ef096f18.tar.bz2 emacs-73cb70eb9a1505040a76e2f1d671c873ef096f18.zip | |
Prepare for Prefix support.
svn path=/emacs-overlay/; revision=1477
Diffstat (limited to 'eclass/elisp-common.eclass')
| -rw-r--r-- | eclass/elisp-common.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
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 |