1 |
* elisp-common.eclass (elisp-compile, elisp-make-autoload-file) |
2 |
(elisp-install, elisp-site-file-install): Die on failure. |
3 |
* elisp.eclass (elisp_src_compile, elisp_src_install): Remove die |
4 |
commands that are no longer necessary because the called functions |
5 |
die themselves. |
6 |
|
7 |
--- a/eclass/elisp-common.eclass |
8 |
+++ b/eclass/elisp-common.eclass |
9 |
@@ -50,7 +50,7 @@ |
10 |
# directory is added to the load-path which makes sure that all files |
11 |
# are loadable. |
12 |
# |
13 |
-# elisp-compile *.el || die |
14 |
+# elisp-compile *.el |
15 |
# |
16 |
# Function elisp-make-autoload-file() can be used to generate a file |
17 |
# with autoload definitions for the lisp functions. It takes the output |
18 |
@@ -70,7 +70,7 @@ |
19 |
# choose something else, but remember to tell elisp-site-file-install() |
20 |
# (see below) the change, as it defaults to ${PN}. |
21 |
# |
22 |
-# elisp-install ${PN} *.el *.elc || die |
23 |
+# elisp-install ${PN} *.el *.elc |
24 |
# |
25 |
# To let the Emacs support be activated by Emacs on startup, you need |
26 |
# to provide a site file (shipped in ${FILESDIR}) which contains the |
27 |
@@ -112,7 +112,7 @@ |
28 |
# |
29 |
# Which is then installed by |
30 |
# |
31 |
-# elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
32 |
+# elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
33 |
# |
34 |
# in src_install(). Any characters after the "-gentoo" part and before |
35 |
# the extension will be stripped from the destination file's name. |
36 |
@@ -168,6 +168,7 @@ EMACSFLAGS="-batch -q --no-site-file" |
37 |
BYTECOMPFLAGS="-L ." |
38 |
|
39 |
# @FUNCTION: elisp-emacs-version |
40 |
+# @RETURN: exit status of Emacs |
41 |
# @DESCRIPTION: |
42 |
# Output version of currently active Emacs. |
43 |
|
44 |
@@ -223,7 +224,7 @@ elisp-need-emacs() { |
45 |
elisp-compile() { |
46 |
ebegin "Compiling GNU Emacs Elisp files" |
47 |
${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" |
48 |
- eend $? "elisp-compile: batch-byte-compile failed" |
49 |
+ eend $? "elisp-compile: batch-byte-compile failed" || die |
50 |
} |
51 |
|
52 |
# @FUNCTION: elisp-make-autoload-file |
53 |
@@ -259,7 +260,7 @@ elisp-make-autoload-file() { |
54 |
--eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \ |
55 |
-f batch-update-autoloads "${@-.}" |
56 |
|
57 |
- eend $? "elisp-make-autoload-file: batch-update-autoloads failed" |
58 |
+ eend $? "elisp-make-autoload-file: batch-update-autoloads failed" || die |
59 |
} |
60 |
|
61 |
# @FUNCTION: elisp-install |
62 |
@@ -275,7 +276,7 @@ elisp-install() { |
63 |
insinto "${SITELISP}/${subdir}" |
64 |
doins "$@" |
65 |
) |
66 |
- eend $? "elisp-install: doins failed" |
67 |
+ eend $? "elisp-install: doins failed" || die |
68 |
} |
69 |
|
70 |
# @FUNCTION: elisp-site-file-install |
71 |
@@ -305,7 +306,7 @@ elisp-site-file-install() { |
72 |
) |
73 |
ret=$? |
74 |
rm -f "${sf}" |
75 |
- eend ${ret} "elisp-site-file-install: doins failed" |
76 |
+ eend ${ret} "elisp-site-file-install: doins failed" || die |
77 |
} |
78 |
|
79 |
# @FUNCTION: elisp-site-regen |
80 |
--- a/eclass/elisp.eclass |
81 |
+++ b/eclass/elisp.eclass |
82 |
@@ -151,7 +151,7 @@ elisp_src_configure() { :; } |
83 |
# GNU Info files from them. |
84 |
|
85 |
elisp_src_compile() { |
86 |
- elisp-compile *.el || die |
87 |
+ elisp-compile *.el |
88 |
if [[ -n ${ELISP_TEXINFO} ]]; then |
89 |
makeinfo ${ELISP_TEXINFO} || die |
90 |
fi |
91 |
@@ -165,9 +165,9 @@ elisp_src_compile() { |
92 |
# ELISP_TEXINFO and documentation listed in the DOCS variable. |
93 |
|
94 |
elisp_src_install() { |
95 |
- elisp-install ${PN} *.el *.elc || die |
96 |
+ elisp-install ${PN} *.el *.elc |
97 |
if [[ -n ${SITEFILE} ]]; then |
98 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
99 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
100 |
fi |
101 |
if [[ -n ${ELISP_TEXINFO} ]]; then |
102 |
set -- ${ELISP_TEXINFO} |