summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-04-26 08:57:47 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-05-06 17:00:46 +0200
commitfc831ede97c541befa73e7019439b1b1b695828c (patch)
tree6808bff17981c061664736da021226e8972c2bc2
parent253fa7e09ff685a98df11ab64937efa97ffddbd9 (diff)
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
-rwxr-xr-xmeson/evas_loader_conf.sh4
-rwxr-xr-xmeson/meson_modules.sh2
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 '.')"
13 13
14original_ext="$(echo "$loader" | tail -c 4)" 14original_ext="$(echo "$loader" | tail -c 4)"
15if test "$original_ext" = "$ext" ; then 15if test "$original_ext" = "$ext" ; then
16 mv "$DESTDIR"/"$original_loader" "$DESTDIR"/"$loader_dir"/"$original_name" 16 mv "$DESTDIR""$original_loader" "$DESTDIR""$loader_dir"/"$original_name"
17fi 17fi
18 18
19shift 19shift
20for x in "$@"; do 20for x in "$@"; do
21 ln -sf "$original_name" "$DESTDIR"/"$loader_dir"/"$loader_name"."$x" 21 ln -sf "$original_name" "$DESTDIR""$loader_dir"/"$loader_name"."$x"
22done 22done
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
4 dir="$(dirname $x)" 4 dir="$(dirname $x)"
5 filename="$(basename $x)" 5 filename="$(basename $x)"
6 ext="${filename##*.}" 6 ext="${filename##*.}"
7 mv "$DESTDIR"/"$x" "$DESTDIR"/"$dir"/module."$ext" 7 mv "$DESTDIR""$x" "$DESTDIR""$dir"/module."$ext"
8done 8done