diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2013-11-29 09:09:33 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2013-11-29 09:09:33 -0800 |
| commit | f5b018b368208b288d81e27d06411e4c6840538e (patch) | |
| tree | d082c6813e5c9dd82f782ca9c299426d17aaa4b9 /eclass/autotools-multilib.eclass | |
| parent | eclass/autotools-multilib: fix AUTOTOOLS_IN_SOURCE_BUILD_DIR (diff) | |
| download | gmt-f5b018b368208b288d81e27d06411e4c6840538e.tar.gz gmt-f5b018b368208b288d81e27d06411e4c6840538e.tar.bz2 gmt-f5b018b368208b288d81e27d06411e4c6840538e.zip | |
eclass/autotools-multilib: variable overriding bug
When DOCS or HTML_DOCS were provided, but were not array
variables, this code did something silly (putting open and
close parenthesis into a string). This maintains the intended
result in that case and the others.
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'eclass/autotools-multilib.eclass')
| -rw-r--r-- | eclass/autotools-multilib.eclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass index 029bc51..7f2660b 100644 --- a/eclass/autotools-multilib.eclass +++ b/eclass/autotools-multilib.eclass @@ -151,7 +151,10 @@ autotools-multilib_src_test() { multilib_src_install() { debug-print-function ${FUNCNAME} "$(my-god-its-full-of-quotation-marks "$@")" - AUTOTOOLS_PRUNE_LIBTOOL_FILES=none DOCS=( ) HTML_DOCS=( ) \ + # override some variables that autotools-utils would attempt to process, but + # for which we have alternate processing in multilib_src_install_all. This + # prevents pointless repeat-installation of nongenerated documentation. + local AUTOTOOLS_PRUNE_LIBTOOL_FILES="none" DOCS=() HTML_DOCS=() do_with_get_libdir_subst _autotools-multilib_munge_build_dir \ autotools-utils_src_install "${_at_args[@]}" } |