From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 20 Sep 2018 07:01:58 +0000 (+0200)
Subject: meson: fix dirname/basename confusion in meson-and-wants.sh install helper (#10126)
X-Git-Tag: v240~706
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f491cccef221a8934d1b0873c8be4977f5c600a;p=platform%2Fupstream%2Fsystemd.git

meson: fix dirname/basename confusion in meson-and-wants.sh install helper (#10126)

We would create a useless empty directory under build/.
It seems we were lucky and all symlinks were installed into directories
which were alredy created because we installed something into the same
location earlier.

While at it, also add '-v' to 'mkdir -p'. This will print the names of
directories as they are created (just once), making it easier to see all of
what the install script is doing.
---

diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index 70f7172..e2b2603 100755
--- a/units/meson-add-wants.sh
+++ b/units/meson-add-wants.sh
@@ -18,10 +18,10 @@ unitpath="${DESTDIR:-}${unitdir}/${unit}"
 
 case "$target" in
         */)
-                mkdir -p -m 0755 "$dir"
+                mkdir -vp -m 0755 "$dir"
                 ;;
         *)
-                mkdir -p -m 0755 "$(basename "$dir")"
+                mkdir -vp -m 0755 "$(dirname "$dir")"
                 ;;
 esac