From 870e8d6ad3415ac61c52e57095fcc6164023a0fc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 10 May 2017 16:58:50 +0200 Subject: build: Fix load-path/compile-path confusion. This is a followup to b4400bc98996f1a3ac7088a8f9e19daf684afcb1. * Makefile.am (nodist_pkgmodule_DATA): New variable. (nodist_pkgobject_DATA): Remove config.scm. (do_subst): Use $(guileobjectdir). --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe7a87b..ee911af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,9 +38,11 @@ dist_pkgmodule_DATA = \ src/cuirass/ui.scm \ src/cuirass/utils.scm +nodist_pkgmodule_DATA = \ + src/cuirass/config.scm + nodist_pkgobject_DATA = \ $(dist_pkgmodule_DATA:.scm=.go) \ - src/cuirass/config.scm \ src/cuirass/config.go dist_pkgdata_DATA = src/schema.sql @@ -142,7 +144,7 @@ do_subst = ( $(SED) \ -e 's,@datadir[@],$(datadir),g' \ -e 's,@GUILE[@],$(GUILE),g' \ -e 's,@localstatedir[@],$(localstatedir),g' \ - -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(guilesitedir),g' \ + -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(guileobjectdir),g' \ -e 's,@PACKAGE_LOAD_PATH[@],$(guilesitedir),g' \ | $(SHELL) ./config.status --file=- ) -- cgit v1.2.3