diff options
| author | Ludovic Courtès | 2018-04-30 10:36:11 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2018-04-30 10:36:11 +0200 |
| commit | acbd354ca0a32a5a551869a3650c9d265b83b204 (patch) | |
| tree | c5d0a300353cd2a1d8033c6e336fa5f80866eb03 /src | |
| parent | baa6c4c9288303cd227ebf7f777df16fdbc7abd0 (diff) | |
| download | skribilo-acbd354ca0a32a5a551869a3650c9d265b83b204.tar.gz skribilo-acbd354ca0a32a5a551869a3650c9d265b83b204.tar.lz skribilo-acbd354ca0a32a5a551869a3650c9d265b83b204.zip | |
build: Install modules and objects in the usual locations.v0.9.4
* configure.ac: Add '--with-guileobjectdir' and substitute
'guileobjectdir'.
* guilec.am (nobase_nodist_module_DATA): Rename to...
(nobase_nodist_guileobject_DATA): ... this
(skr_install_go_files): Change value to
'install-nobase_nodist_guileobjectDATA'.
* src/guile/Makefile.am (nobase_nodist_module_DATA): Change "+=" to
"=".
(nobase_nodist_module_DATA): Rename to...
(nobase_nodist_guileobject_DATA): ... this.
* src/skribilo.in (GUILE_LOAD_COMPILED_PATH): Use @guileobjectdir@.
* substitute.am (substitute): Add @guileobjectdir@.
Diffstat (limited to 'src')
| -rw-r--r-- | src/guile/Makefile.am | 6 | ||||
| -rwxr-xr-x | src/skribilo.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am index e4dd75c..2d6571c 100644 --- a/src/guile/Makefile.am +++ b/src/guile/Makefile.am @@ -1,5 +1,5 @@ # Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2012, -# 2015 Ludovic Courtès <ludo@gnu.org> +# 2015, 2018 Ludovic Courtès <ludo@gnu.org> # # This file is part of Skribilo. # @@ -91,13 +91,13 @@ include $(top_srcdir)/substitute.am include $(top_srcdir)/guilec.am # Generated files not part of the distribution. -nobase_nodist_module_DATA += \ +nobase_nodist_module_DATA = \ skribilo/config.scm \ skribilo/utils/images.scm if HAVE_GUILE2 -nobase_nodist_module_DATA += \ +nobase_nodist_guileobject_DATA += \ skribilo/config.go \ skribilo/utils/images.go diff --git a/src/skribilo.in b/src/skribilo.in index 30a7b02..ca44108 100755 --- a/src/skribilo.in +++ b/src/skribilo.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009 Ludovic Courtès <ludo@gnu.org> +# Copyright 2005, 2006, 2007, 2008, 2009, 2018 Ludovic Courtès <ludo@gnu.org> # # # This file is part of Skribilo. @@ -24,7 +24,7 @@ # needed, the use should explicitly set the `GUILE' environment # variable to, e.g., "guile --debug". -GUILE_LOAD_COMPILED_PATH="@guilemoduledir@:$GUILE_LOAD_COMPILED_PATH" +GUILE_LOAD_COMPILED_PATH="@guileobjectdir@:$GUILE_LOAD_COMPILED_PATH" export GUILE_LOAD_COMPILED_PATH main='(module-ref (resolve-interface '\''(skribilo)) '\'skribilo')' |