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 69eab9ba733542d7885592b4d8ca88a6822f4735..360ff92ebb223e83b9e4e12377f4b0516a68b8e7 100755 (executable)
--- 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 7fbf5ed6fc9c62cf9311642bd86a51599ffd12f8..e2f5a355bc7da1ee90e681b42bc5cefbe6e5ce5d 100755 (executable)
--- 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
     */)