--- deliantra/Deliantra-Client/util/gatherer	2011/12/30 23:43:25	1.6
+++ deliantra/Deliantra-Client/util/gatherer	2011/12/31 04:23:43	1.7
@@ -19,7 +19,7 @@
    . ~/.setenv
 
    OS=windows
-   URLADER=windowx-x86
+   URLADER=windows-x86
    unset PANGO
    PERL=/c/perl/bin/perl
    MAKE=nmake
@@ -107,7 +107,7 @@
       base=$(basename "$lib")
       [ "$base" = pango-basic-x.$LIBEXT ] && continue
       cp -p "$lib" "$DIST"/.
-      echo "$base $rest" >&5
+      echo "./$base $rest" >&5 # using ./ seems to help pango not to rummage around in /usr/lib etc.
    done
 )
 
@@ -284,7 +284,7 @@
    if [ "$OS" != windows ]; then
       # patch braindamaged pango
       set libpango-1.0.$LIB0
-      perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <"$1" >"$1~" && mv "$1~" "$1"
+      perl -pe 's{/u(?=sr/lib(32)?/pango)}{.\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <"$1" >"$1~" && mv "$1~" "$1"
       chmod 755 "$1"
    fi
 
@@ -328,8 +328,10 @@
       done
    fi
 
-   [ "$OS" = linux ] && chrpath -d perl # debian perls have an rpath. really.
+   [ "$OS" = linux ] && chrpath -d perl $(find pm -name "*.so") # debian perls have an rpath, many modules too
    $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl
+
+   : >timidity.cfg
 )
 
 cat >"$DIST".vars <<EOF
@@ -337,6 +339,6 @@
 G_OS="$OS"
 G_ARCHNAME="$ARCHNAME"
 G_ENVVARS="$GENPACK_ENVVARS"
-G_ARGS="./perl run"
+G_COMMAND="./perl run"
 EOF