summary refs log tree commit diff
path: root/guilec.am
diff options
context:
space:
mode:
authorLudovic Courtès2018-04-30 10:36:11 +0200
committerLudovic Courtès2018-04-30 10:36:11 +0200
commitacbd354ca0a32a5a551869a3650c9d265b83b204 (patch)
treec5d0a300353cd2a1d8033c6e336fa5f80866eb03 /guilec.am
parentbaa6c4c9288303cd227ebf7f777df16fdbc7abd0 (diff)
downloadskribilo-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 'guilec.am')
-rw-r--r--guilec.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/guilec.am b/guilec.am
index dc6e870..8fa3daf 100644
--- a/guilec.am
+++ b/guilec.am
@@ -7,7 +7,7 @@ if HAVE_GUILE2
 GOBJECTS = $(SOURCES:%.scm=%.go)
 
 nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED)
-nobase_nodist_module_DATA = $(GOBJECTS)
+nobase_nodist_guileobject_DATA = $(GOBJECTS)
 
 # Compiler warnings.
 guile_warnings =							\
@@ -46,12 +46,12 @@ SUFFIXES += .go
 # files.  See
 # <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
 # for details.
-skr_install_go_files = install-nobase_nodist_moduleDATA
+skr_install_go_files = install-nobase_nodist_guileobjectDATA
 $(skr_install_go_files): install-nobase_dist_moduleDATA
 
 else !HAVE_GUILE2
 
 nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED)
-nobase_nodist_module_DATA =
+nobase_nodist_guileobject_DATA =
 
 endif !HAVE_GUILE2