summaryrefslogtreecommitdiffstats
path: root/units
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-20 18:06:14 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-25 01:25:33 +0200
commitdc25d2adb5ed252c2f702f0075ad74fee684d78a (patch)
tree6647fc20f59dbfa2ff5554b47839d859195e617f /units
parentmeson: define gnu_efi_arch for the arch efi name, fix ldsdir detection (diff)
downloadsystemd-dc25d2adb5ed252c2f702f0075ad74fee684d78a.tar.xz
systemd-dc25d2adb5ed252c2f702f0075ad74fee684d78a.zip
meson: $DESTDIR might be undefined
This causes an error with -u. Just add an empty fallback.
Diffstat (limited to 'units')
-rwxr-xr-xunits/meson-add-wants.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index 7fbf5ed6fc..e2f5a355bc 100755
--- a/units/meson-add-wants.sh
+++ b/units/meson-add-wants.sh
@@ -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
*/)