summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-09-25 11:43:08 +0200
committerUlrich Müller <ulm@gentoo.org>2020-09-25 11:44:52 +0200
commit4e64b46923a18a5804012e1c164e274b0f77f831 (patch)
treeb619022ebda467ebbce1b15c6c98ddd5806612cc /eclass
parentsys-power/suspend: patchlevel bump (diff)
downloadgentoo-4e64b46923a18a5804012e1c164e274b0f77f831.tar.gz
gentoo-4e64b46923a18a5804012e1c164e274b0f77f831.tar.bz2
gentoo-4e64b46923a18a5804012e1c164e274b0f77f831.zip
elisp-common.eclass: Fix QA warning in elisp-site-file-install.
Thanks to ago for pointing this out. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/elisp-common.eclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index e6346d43ccfb..66a3a325e673 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -407,9 +407,12 @@ elisp-site-file-install() {
sf="${T}/${sf}"
ebegin "Installing site initialisation file for GNU Emacs"
[[ $1 = "${sf}" ]] || cp "$1" "${sf}"
- [[ ${EAPI} == [45] ]] && grep -q "@EMACSMODULES@" "${sf}" \
- && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
- modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+ if [[ ${EAPI} == [45] ]]; then
+ grep -q "@EMACSMODULES@" "${sf}" \
+ && die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
+ else
+ modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+ fi
sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \