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@. --- substitute.am | 1 + 1 file changed, 1 insertion(+) (limited to 'substitute.am') diff --git a/substitute.am b/substitute.am index 004e7c3..4f69cb8 100644 --- a/substitute.am +++ b/substitute.am @@ -5,6 +5,7 @@ AM_V_SUBSTITUTE_ = $(AM_V_SUBSTITUTE_$(AM_DEFAULT_VERBOSITY)) AM_V_SUBSTITUTE_0 = @echo " SUBSTITUTE" $@; substitute = sed -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \ + -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \ -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \ -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]prefix[@],$(prefix),g' \ -- cgit v1.2.3