diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-10 16:58:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-10 16:58:50 +0200 |
| commit | 870e8d6ad3415ac61c52e57095fcc6164023a0fc (patch) | |
| tree | bb5459d00c5eabace84caf9670af0e1a5a06b0e3 | |
| parent | b4400bc98996f1a3ac7088a8f9e19daf684afcb1 (diff) | |
| download | cuirass-870e8d6ad3415ac61c52e57095fcc6164023a0fc.tar cuirass-870e8d6ad3415ac61c52e57095fcc6164023a0fc.tar.gz | |
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).
| -rw-r--r-- | Makefile.am | 6 |
1 files 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=- ) |