view patches/guile-1.9.14-cross.patch @ 6457:a2efa3f96861

guile: cross build and mingw fork fixes.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 31 Jan 2011 15:03:32 +0100
parents 344d21a6233d
children
line wrap: on
line source

--- guile-1.9.14/meta/guile.in~	2010-12-14 19:15:17.000000000 +0100
+++ guile-1.9.14/meta/guile.in	2011-01-29 13:31:24.227563342 +0100
@@ -45,7 +45,8 @@ XDG_CACHE_HOME=${top_builddir}/cache
 export XDG_CACHE_HOME
 
 # do it
-exec ${top_builddir}/meta/uninstalled-env $GUILE "$@"
+#exec ${top_builddir}/meta/uninstalled-env $GUILE "$@"
+exec @GUILE_FOR_BUILD@ "$@"
 
 # never reached
 exit 1
--- guile-1.9.14/Makefile.am~	2010-12-14 19:15:16.000000000 +0100
+++ guile-1.9.14/Makefile.am	2011-01-29 15:36:05.312047266 +0100
@@ -32,8 +32,6 @@ SUBDIRS =					\
 	guile-readline				\
 	examples				\
 	emacs					\
-	test-suite				\
-	benchmark-suite				\
 	am					\
 	doc
 
--- guile-1.9.14/meta/guile-2.0.pc.in~	2010-12-14 19:15:17.000000000 +0100
+++ guile-1.9.14/meta/guile-2.0.pc.in	2011-01-31 13:39:29.453612101 +0100
@@ -5,7 +5,7 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 pkgdatadir=@datadir@/guile
-pkgincludedir=@includedir@/guile
+pkgincludedir=${includedir}/guile
 
 sitedir=@sitedir@
 extensiondir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions