From 3f491cccef221a8934d1b0873c8be4977f5c600a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 20 Sep 2018 09:01:58 +0200 Subject: [PATCH] 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. --- units/meson-add-wants.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh index 70f7172ae9..e2b260398c 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