From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 20 Apr 2017 16:06:14 +0000 (-0400)
Subject: meson: $DESTDIR might be undefined
X-Git-Tag: v234~286^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc25d2adb5ed252c2f702f0075ad74fee684d78a;p=thirdparty%2Fsystemd.git

meson: $DESTDIR might be undefined

This causes an error with -u. Just add an empty fallback.
---

diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
index 69eab9ba733..360ff92ebb2 100755
--- a/tools/meson-make-symlink.sh
+++ b/tools/meson-make-symlink.sh
@@ -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
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index 7fbf5ed6fc9..e2f5a355bc7 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
     */)