diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-05-18 16:37:31 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-05-18 16:37:31 +0200 |
| commit | 7775d6825cd8a37cdcca83a062f7d09546981184 (patch) | |
| tree | 3088ffb0bfd04d3fd1841a37e97d45b36c35d2a6 /eclass/elisp-common.eclass | |
| parent | Merge changes from emacs-vcs. (diff) | |
| download | emacs-7775d6825cd8a37cdcca83a062f7d09546981184.tar.gz emacs-7775d6825cd8a37cdcca83a062f7d09546981184.tar.bz2 emacs-7775d6825cd8a37cdcca83a062f7d09546981184.zip | |
elisp-common.eclass: Look for site-init files in site-gentoo.d only.
* elisp-common.eclass (elisp-site-regen): Look for site-init files
only in site-gentoo.d subdirectory.
Diffstat (limited to 'eclass/elisp-common.eclass')
| -rw-r--r-- | eclass/elisp-common.eclass | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index d1e7fbb..12bbc00 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @@ -369,16 +369,8 @@ elisp-site-regen() { ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" - for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ - "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el - do - [[ -r ${sf} ]] || continue - # sort files by their basename. straight insertion sort. - for ((i=${#sflist[@]}; i>0; i--)); do - [[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break - sflist[i]=${sflist[i-1]} - done - sflist[i]=${sf} + for sf in "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el; do + [[ -r ${sf} ]] && sflist+=("${sf}") done cat <<-EOF >"${T}"/site-gentoo.el |