aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2008-05-13 16:59:48 +0000
committerAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2008-05-13 16:59:48 +0000
commit5948ff3f57deb39a38639bf5949623c961324046 (patch)
treeebea534c1500fb64740b6617b78e93ac88515431
parente9cb1d6a2e87901ceaee28c65b199e59f7f9d2f1 (diff)
downloadpaludis-5948ff3f57deb39a38639bf5949623c961324046.tar.gz
paludis-5948ff3f57deb39a38639bf5949623c961324046.tar.xz
Don't silently ignore elements in DEFAULT_SRC_{CONFIGURE,INSTALL}_* if they are arrays.
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_configure.bash6
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_install.bash8
2 files changed, 7 insertions, 7 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
index 00a5c8d..3736ca6 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
@@ -24,11 +24,11 @@ default_src_configure()
{
if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
econf \
- ${DEFAULT_SRC_CONFIGURE_PARAMS} \
- $(for s in ${DEFAULT_SRC_CONFIGURE_OPTION_ENABLES} ; do \
+ ${DEFAULT_SRC_CONFIGURE_PARAMS[@]} \
+ $(for s in ${DEFAULT_SRC_CONFIGURE_OPTION_ENABLES[@]} ; do \
option_enable "${s}" ; \
done ) \
- $(for s in ${DEFAULT_SRC_CONFIGURE_OPTION_WITHS} ; do \
+ $(for s in ${DEFAULT_SRC_CONFIGURE_OPTION_WITHS[@]} ; do \
option_with "${s}" ; \
done )
fi
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_install.bash b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
index 81902e9..57ca463 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_install.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
@@ -36,7 +36,7 @@ default_src_install()
done_docs=
old_set=$(shopt | grep 'nocaseglob[[:space:]]*on')
shopt -s nocaseglob
- for d in '' ${DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS} ; do
+ for d in '' ${DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS[@]} ; do
if [[ -n ${d} ]]; then
[[ -d ${d} ]] || die "${d} is not a dir"
pushd "${d}" > /dev/null || die "Failed to enter ${d}"
@@ -45,11 +45,11 @@ default_src_install()
fi
for f in README Change{,s,Log} AUTHORS NEWS TODO ABOUT THANKS {KNOWN_,}BUGS SUBMITTING \
HACKING FAQ CREDITS PKG-INFO HISTORY PACKAGING MAINTAINER{,S} CONTRIBUT{E,OR,ORS} RELEASE \
- ANNOUNCE PORTING NOTES PROBLEMS NOTICE ${DEFAULT_SRC_INSTALL_EXTRA_DOCS}; do
- for p in ${DEFAULT_SRC_INSTALL_EXTRA_PREFIXES} '' ; do
+ ANNOUNCE PORTING NOTES PROBLEMS NOTICE ${DEFAULT_SRC_INSTALL_EXTRA_DOCS[@]}; do
+ for p in ${DEFAULT_SRC_INSTALL_EXTRA_PREFIXES[@]} '' ; do
for doc in *([[:digit:]])${p}${f}{,+([._-])*} ; do
if [[ -s "${doc}" ]] ; then
- for e in ${DEFAULT_SRC_INSTALL_EXCLUDE} ; do
+ for e in ${DEFAULT_SRC_INSTALL_EXCLUDE[@]} ; do
[[ ${doc} == ${e} ]] && continue 2
done
done_docs="${done_docs} ${d%/}${d:+/}${doc}"