gnucash-on-windows master: Fix malformed guile load path string.

John Ralls jralls at code.gnucash.org
Sun Apr 28 14:31:32 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/ac4de50e (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/1365ad57 (commit)



commit ac4de50e27906c359c9ed4590d9dd1f5db1b7453
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Apr 26 13:45:37 2019 -0700

    Fix malformed guile load path string.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index 8bcc62c..585efa2 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -82,10 +82,8 @@ append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/Open
 append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
 module_makeargs["aqbanking"]="-j 1"
 module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
-module_makeargs["gnucash"]="-j 8"
-module_makeargs["gnucash-git"]="-j 8"
 
-module_extra_env["gnucash"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
-module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
+module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
 module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
 



Summary of changes:
 jhbuildrc.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list