>From 9a9556d4e1f3ebcabcfd31f9259e49711d9175f3 Mon Sep 17 00:00:00 2001
From: Knut Petersen <address@hidden>
Date: Wed, 9 Jan 2019 13:58:17 +0100
Subject: [PATCH] Fix building of guile on openSuSE Tumbleweed

Also fixes building guile on Ubuntu 18.04

Version 3, based on an analysis of Werner Lemberg.

Signed-off-by: Knut Petersen <address@hidden>
---
 gub/specs/guile.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gub/specs/guile.py b/gub/specs/guile.py
index 9f2ac0d1..61b17ec4 100644
--- a/gub/specs/guile.py
+++ b/gub/specs/guile.py
@@ -35,14 +35,7 @@ LD_PRELOAD=
 C_INCLUDE_PATH=
 CPPFLAGS=
 LIBRARY_PATH=
-PATH_SEPARATOR=':'
-PATH=/usr/bin:$PATH
-/usr/bin/cc
--I%(builddir)s
--I%(srcdir)s
--I%(builddir)s/libguile
--I.
--I%(srcdir)s/libguile"
+/usr/bin/cc"
 '''))
     # FIXME: guile runs gen_scmconfig [when not x-building also guile]
     # without setting the proper LD_LIBRARY_PATH.
@@ -170,7 +163,7 @@ libltdl_cv_sys_search_path=${libltdl_cv_sys_search_path="%(system_prefix)s/lib"}
         self.system ('''cd %(install_prefix)s/bin && cp guile.exe guile-windows.exe''')
 
 class Guile__linux (Guile):
-    compile_command = ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:$LD_LIBRARY_PATH;'
+    compile_command = ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:%(system_prefix)s/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH};'
                 + Guile.compile_command)
 
 class Guile__linux__ppc (Guile__linux):
-- 
2.20.1