diff options
| author | Ludovic Courtès | 2009-11-20 12:04:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès | 2009-11-20 12:11:38 +0100 |
| commit | 238a6ee02e730e148d84dbc7fac4b7a46140031f (patch) | |
| tree | e85b954cc6da743cb2ea66f86e76c045360b7836 /src | |
| parent | cf8a9c935c972d06b265ef5e80e0318047c74ad2 (diff) | |
| download | skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.tar.gz skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.tar.lz skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.zip | |
Define $GUILE_LOAD_COMPILED_PATH for Guile 2.x.
* guile-vm.am (guile_warnings): New variable. (.scm.go): Set $GUILE_LOAD_COMPILED_PATH appropriately, specify Guile compilation warnings. * src/pre-inst-skribilo.in, src/skribilo.in: Set $GUILE_LOAD_COMPILED_PATH appropriately. * tests/Makefile.am (TESTS_ENVIRONMENT): Set $GUILE_AUTO_COMPILE and $GUILE_LOAD_COMPILED_PATH. * doc/user/Makefile.am (skribilo.info, .skb.html, .skb.lout, .skb.tex, .skb.ctx): Set $GUILE_LOAD_COMPILED_PATH. (load_compiled_path): New variable.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/pre-inst-skribilo.in | 5 | ||||
| -rwxr-xr-x | src/skribilo.in | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/pre-inst-skribilo.in b/src/pre-inst-skribilo.in index 3a5c0d8..eb93e8e 100755 --- a/src/pre-inst-skribilo.in +++ b/src/pre-inst-skribilo.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007 Ludovic Courtès <ludo@gnu.org> +# Copyright 2007, 2009 Ludovic Courtès <ludo@gnu.org> # # # This program is free software; you can redistribute it and/or modify @@ -21,6 +21,9 @@ # A pre-installation `skribilo' executable that makes sure to load # stuff from the source directory rather than the installation directory. +GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@/src/guile:$GUILE_LOAD_COMPILED_PATH" +export GUILE_LOAD_COMPILED_PATH + main='(module-ref (resolve-interface '\''(skribilo)) '\'skribilo')' exec ${GUILE-@GUILE@} -L "@abs_top_srcdir@/src/guile" \ -L "@abs_top_builddir@/src/guile" \ diff --git a/src/skribilo.in b/src/skribilo.in index 95d75b7..f5d3d75 100755 --- a/src/skribilo.in +++ b/src/skribilo.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008 Ludovic Courtès <ludo@gnu.org> +# Copyright 2005, 2006, 2007, 2008, 2009 Ludovic Courtès <ludo@gnu.org> # # # This program is free software; you can redistribute it and/or modify @@ -20,10 +20,13 @@ # The `skribilo' executable. -# Don't pass `--debug' by default (for performance reason). When +# Don't pass `--debug' by default (for performance reasons). When # needed, the use should explicitly set the `GUILE' environment # variable to, e.g., "guile --debug". +GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH" +export GUILE_LOAD_COMPILED_PATH + main='(module-ref (resolve-interface '\''(skribilo)) '\'skribilo')' exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -c " |