From e960714c3b8abd49dde32285d6c951ebe29d4896 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 7 Mar 2017 13:54:57 +0100 Subject: [PATCH] Remove library version from waf libdir --- satellites/waf.sat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/satellites/waf.sat b/satellites/waf.sat index 6f56fdd..ef92358 100644 --- a/satellites/waf.sat +++ b/satellites/waf.sat @@ -15,8 +15,8 @@ compile_waf -b "python3 ./$name-light" -- --make-waf sed -i -e '/^#==>$/,/^#<==$/d' "$name" # Strip revision from the libdir name -sed -i -e '/dirname =/s/%s-%s-%s/%s-%s/' \ - -e '/dirname =/s/, REVISION//' "$name" +sed -i -e '/dirname =/s/%s-%s-%s/%s/' \ + -e '/dirname =/s/, VERSION, REVISION//' "$name" # Change the logic of checking dirs to find waflib to only check one dir, the dir where we installed it. sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "/$dir_prefix")',/" \ @@ -29,7 +29,7 @@ sed -i -e '1s/python/python3/' "$name" install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" # Install library -wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3-$version" +wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3" install -d "$wafdir" unzip -od "$wafdir" zip/waflib.zip python3 -OOm compileall "$wafdir"