From acbd354ca0a32a5a551869a3650c9d265b83b204 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Apr 2018 10:36:11 +0200 Subject: build: Install modules and objects in the usual locations. * 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@. --- src/skribilo.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/skribilo.in') 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 +# Copyright 2005, 2006, 2007, 2008, 2009, 2018 Ludovic Courtès # # # 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')' -- cgit v1.2.3