1 |
ulm 07/12/01 15:35:02 |
2 |
|
3 |
Modified: elisp-common.eclass |
4 |
Log: |
5 |
Partial sync from Emacs overlay: |
6 |
New variable SITEETC. |
7 |
Replace basename by bash parameter expansion. |
8 |
|
9 |
Revision Changes Path |
10 |
1.31 eclass/elisp-common.eclass |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.31&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.31&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?r1=1.30&r2=1.31 |
15 |
|
16 |
Index: elisp-common.eclass |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
19 |
retrieving revision 1.30 |
20 |
retrieving revision 1.31 |
21 |
diff -u -r1.30 -r1.31 |
22 |
--- elisp-common.eclass 17 Nov 2007 15:39:35 -0000 1.30 |
23 |
+++ elisp-common.eclass 1 Dec 2007 15:35:02 -0000 1.31 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2007 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.30 2007/11/17 15:39:35 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.31 2007/12/01 15:35:02 ulm Exp $ |
29 |
# |
30 |
# Copyright 2007 Christian Faulhammer <opfer@g.o> |
31 |
# Copyright 2002-2004 Matthew Kennedy <mkennedy@g.o> |
32 |
@@ -129,9 +129,12 @@ |
33 |
|
34 |
# @ECLASS-VARIABLE: SITELISP |
35 |
# @DESCRIPTION: |
36 |
-# Directory where Emacs Lisp files are installed. |
37 |
+# Directory where packages install Emacs Lisp files. |
38 |
SITELISP=/usr/share/emacs/site-lisp |
39 |
|
40 |
+# Directory where packages install miscellaneous (not Lisp) files. |
41 |
+SITEETC=/usr/share/emacs/etc |
42 |
+ |
43 |
# @ECLASS-VARIABLE: SITEFILE |
44 |
# @DESCRIPTION: |
45 |
# Name of package's site-init file. |
46 |
@@ -256,10 +259,11 @@ |
47 |
local sf="$1" my_pn="${2:-${PN}}" |
48 |
einfo "Installing site initialisation file for GNU Emacs ..." |
49 |
cp "${sf}" "${T}" |
50 |
- sed -i "s:@SITELISP@:${SITELISP}/${my_pn}:g" "${T}/$(basename "${sf}")" |
51 |
+ sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \ |
52 |
+ -e "s:@SITEETC@:${SITEETC}/${my_pn}:g" "${T}/${sf##*/}" |
53 |
( # subshell to avoid pollution of calling environment |
54 |
insinto "${SITELISP}" |
55 |
- doins "${T}/$(basename "${sf}")" |
56 |
+ doins "${T}/${sf##*/}" |
57 |
) |
58 |
} |
59 |
|
60 |
@@ -303,7 +307,7 @@ |
61 |
for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el |
62 |
do |
63 |
[ -r "${sf}" ] || continue |
64 |
- sflist="${sflist} $(basename "${sf}")" |
65 |
+ sflist="${sflist} ${sf##*/}" |
66 |
cat "${sf}" >>"${T}"/site-gentoo.el |
67 |
done |
68 |
|
69 |
@@ -335,7 +339,7 @@ |
70 |
|
71 |
All site initialisation for Gentoo-installed packages is added to |
72 |
/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer |
73 |
-managed by Gentoo. You are responsible for all maintenance of |
74 |
+managed by Gentoo. You are responsible for all maintenance of |
75 |
site-start.el if there is such a file. |
76 |
|
77 |
In order for this site initialisation to be loaded for all users |
78 |
@@ -344,9 +348,9 @@ |
79 |
(require 'site-gentoo) |
80 |
|
81 |
to /usr/share/emacs/site-lisp/site-start.el. Alternatively, that line |
82 |
-can be added by individual users to their initialisation files, or for |
83 |
-greater flexibility, users can select which of the package-specific |
84 |
-initialisation files in /usr/share/emacs/site-lisp/ to load. |
85 |
+can be added by individual users to their initialisation files, or, |
86 |
+for greater flexibility, users can load individual package-specific |
87 |
+initialisation files from /usr/share/emacs/site-lisp/. |
88 |
EOF |
89 |
echo |
90 |
fi |
91 |
|
92 |
|
93 |
|
94 |
-- |
95 |
gentoo-commits@g.o mailing list |