bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=1aae2fc03e9b9c93642f84a61ee062fac356aafe
commit 1aae2fc03e9b9c93642f84a61ee062fac356aafe Author: Marcel Hollerbach <[email protected]> Date: Wed Mar 28 14:12:26 2018 +0100 meson: fix scripts for installing they used to depend on .so as extension, not anymore now --- meson/evas_loader_conf.sh | 6 ++++-- meson/meson_modules.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson/evas_loader_conf.sh b/meson/evas_loader_conf.sh index d51f016b71..5ed40e3a2e 100755 --- a/meson/evas_loader_conf.sh +++ b/meson/evas_loader_conf.sh @@ -1,12 +1,14 @@ #!/bin/bash original_loader=$1 -original_name="$(basename $original_loader .so)" +filename="$(basename $original_loader)" +ext="${ext##*.}" +original_name="$(basename $original_loader $ext)" loader_dir="$(dirname $original_loader)" loader="$(basename $original_loader)" loader_name="$(echo $original_name | cut -f 1 -d '.')" -if [ ${original_loader: -3} == ".so" ] +if [ ${original_loader: -3} == "$ext" ] then mv "$DESTDIR"/"$original_loader" "$DESTDIR"/"$loader_dir"/"$original_name" fi diff --git a/meson/meson_modules.sh b/meson/meson_modules.sh index c6f23181a8..3398e048b5 100755 --- a/meson/meson_modules.sh +++ b/meson/meson_modules.sh @@ -1,6 +1,8 @@ #!/bin/sh for x in "$@" ; do - dir="$(dirname $x)" - mv "$DESTDIR"/"$x" "$DESTDIR"/"$dir"/module.so + dir="$(dirname $x)" + filename="$(basename $x)" + ext="${filename##*.}" + mv "$DESTDIR"/"$x" "$DESTDIR"/"$dir"/module."$ext" done --
