Use real guile binary instead of libtool wrapper in guile-config

Fix FTBFS (introduced by me in 2.18.2-5) on kfreebsd-{amd64,i386}.

diff --git a/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch b/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch
index 86e52271323b7807f88f62fb8d05e5b0c0e3d385..b0f2a6557c61e410845ebbb9e3e5d4ee84c59f26 100644 (file)
--- a/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch
+++ b/debian/patches/0100-guile-config-link-static-libguile.a-for-lilypond.patch
@@ -7,7 +7,7 @@ Author: Anthony Fok <foka@debian.org>
 Origin: vendor
 Bug-Debian: https://bugs.debian.org/746005
 Forwarded: not-needed
-Last-Update: 2017-01-23
+Last-Update: 2017-01-29
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/guile18/guile-config/guile-config.in
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        rm -f guile-config.tmp
        sed < ${srcdir}/guile-config.in > guile-config.tmp \
 -          -e 's|@-bindir-@|${bindir}|' \
-+          -e 's|@-bindir-@|${abs_top_builddir}/libguile|' \
++          -e 's|@-bindir-@|$(dir ${abs_top_builddir})out/guile${bindir}|' \
            -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
        chmod +x guile-config.tmp
        mv guile-config.tmp guile-config