bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fc831ede97c541befa73e7019439b1b1b695828c
commit fc831ede97c541befa73e7019439b1b1b695828c Author: Mike Blumenkrantz <[email protected]> Date: Fri Apr 26 08:57:47 2019 -0400 meson: don't add / after DESTDIR in install scripts this breaks windows usage and is unnecessary since the filename begins with / Reviewed-by: Marcel Hollerbach <[email protected]> Differential Revision: https://phab.enlightenment.org/D8723 --- meson/evas_loader_conf.sh | 4 ++-- meson/meson_modules.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson/evas_loader_conf.sh b/meson/evas_loader_conf.sh index 5fd4259f8f..bacc3660a1 100755 --- a/meson/evas_loader_conf.sh +++ b/meson/evas_loader_conf.sh @@ -13,10 +13,10 @@ loader_name="$(echo "$loader" | cut -f 1 -d '.')" original_ext="$(echo "$loader" | tail -c 4)" if test "$original_ext" = "$ext" ; then - mv "$DESTDIR"/"$original_loader" "$DESTDIR"/"$loader_dir"/"$original_name" + mv "$DESTDIR""$original_loader" "$DESTDIR""$loader_dir"/"$original_name" fi shift for x in "$@"; do - ln -sf "$original_name" "$DESTDIR"/"$loader_dir"/"$loader_name"."$x" + ln -sf "$original_name" "$DESTDIR""$loader_dir"/"$loader_name"."$x" done diff --git a/meson/meson_modules.sh b/meson/meson_modules.sh index 3398e048b5..328cc9948e 100755 --- a/meson/meson_modules.sh +++ b/meson/meson_modules.sh @@ -4,5 +4,5 @@ for x in "$@" ; do dir="$(dirname $x)" filename="$(basename $x)" ext="${filename##*.}" - mv "$DESTDIR"/"$x" "$DESTDIR"/"$dir"/module."$ext" + mv "$DESTDIR""$x" "$DESTDIR""$dir"/module."$ext" done --
