stdenv/multiple-outputs.sh: small tweaks

- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
  (note: some paths are auto-removed by default, e.g. gtk-doc and man3)
This commit is contained in:
Vladimír Čunát
2016-01-12 23:57:47 +01:00
parent e22d26bedb
commit 19d22184d3
2 changed files with 3 additions and 2 deletions
@@ -106,7 +106,7 @@ moveToOutput() {
if rmdir "$srcParent"; then
echo "Removing empty $srcParent/ and (possibly) its parents"
rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \
> /dev/null || true # doesn't ignore failure for some reason
2> /dev/null || true # doesn't ignore failure for some reason
fi
done
done
@@ -114,7 +114,6 @@ moveToOutput() {
# Move documentation to the desired outputs.
_multioutDocs() {
if [ "$outputs" = "out" ]; then return; fi;
local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
moveToOutput share/info "${!outputInfo}"