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/guile/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/guile') 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 +# 2015, 2018 Ludovic Courtès # # 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 -- cgit v1.2.3