shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-27 13:57:26 +03:00
Code

meson: $DESTDIR might be undefined

Browse Source 
This causes an error with -u. Just add an empty fallback.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-20 12:06:14 -04:00
parent 6800fe7f06
commit dc25d2adb5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/meson-make-symlink.sh
View File

@ -3,9 +3,9 @@
# this is needed mostly because $DESTDIR is provided as a variable,
# and we need to create the target directory...
mkdir -vp "$(dirname "${DESTDIR}$2")"
mkdir -vp "$(dirname "${DESTDIR:-}$2")"
if [ "$(dirname $1)" = . ]; then
ln -vfs -T "$1" "${DESTDIR}$2"
ln -vfs -T "$1" "${DESTDIR:-}$2"
else
ln -vfs -T --relative "${DESTDIR}$1" "${DESTDIR}$2"
ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
fi

6
units/meson-add-wants.sh
View File

@ -6,14 +6,14 @@ unit="$3"
case "$target" in
*/?*) # a path, but not just a slash at the end
dir="${DESTDIR}${target}"
dir="${DESTDIR:-}${target}"
;;
*)
dir="${DESTDIR}${unitdir}/${target}"
dir="${DESTDIR:-}${unitdir}/${target}"
;;
esac
unitpath="${DESTDIR}${unitdir}/${unit}"
unitpath="${DESTDIR:-}${unitdir}/${unit}"
case "$target" in
*/)