summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild16
2 files changed, 10 insertions, 9 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 46cc044..69dbcd0 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild:
+ Simplify logic for configuring C source directory.
+
21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild,
metadata.xml:
Merge changes from portage tree.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 6ad765c..4842ece 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -255,26 +255,24 @@ src_install () {
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
- local cdir="${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src"
- local c=";;"
+ local cdir
if use source; then
- insinto /usr/share/emacs/${FULL_VERSION}/src
+ cdir="/usr/share/emacs/${FULL_VERSION}/src"
+ insinto "${cdir}"
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
- c=""
elif has installsources ${FEATURES}; then
- cdir="${EPREFIX}/usr/src/debug/${CATEGORY}/${PF}/${S#${WORKDIR}/}/src"
- c=""
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
- sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X ${c}(setq find-function-C-source-directory
- X ${c} "${cdir}")
+ Y (setq find-function-C-source-directory
+ Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))