diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-04-26 08:57:47 -0400 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-05-06 17:00:46 +0200 |
| commit | fc831ede97c541befa73e7019439b1b1b695828c (patch) | |
| tree | 6808bff17981c061664736da021226e8972c2bc2 /meson | |
| parent | 253fa7e09ff685a98df11ab64937efa97ffddbd9 (diff) | |
| download | efl-fc831ede97c541befa73e7019439b1b1b695828c.tar.gz | |
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 <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D8723
Diffstat (limited to 'meson')
| -rwxr-xr-x | meson/evas_loader_conf.sh | 4 | ||||
| -rwxr-xr-x | 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 |