diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-09-20 09:01:58 +0200 |
|---|---|---|
| committer |   Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-20 16:01:58 +0900 |
| commit | 3f491cccef221a8934d1b0873c8be4977f5c600a (patch) | |
| tree | f3eec93bff1f43e081656fecd57563dceda5285c /units | |
| parent | Merge pull request #10113 from yuwata/unify-hwdb (diff) | |
| download | systemd-3f491cccef221a8934d1b0873c8be4977f5c600a.tar.gz systemd-3f491cccef221a8934d1b0873c8be4977f5c600a.tar.bz2 systemd-3f491cccef221a8934d1b0873c8be4977f5c600a.zip | |
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.
Diffstat (limited to 'units')
| -rwxr-xr-x | units/meson-add-wants.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh index 70f7172ae..e2b260398 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 |