diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-02 15:43:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-02 15:44:35 +0200 |
| commit | 4aabc8eaa22314b412d8c5517e05085aa1b38498 (patch) | |
| tree | bbbdb329d01f6a03457d4e0cff2e5193c53f0ea6 | |
| parent | 693f12ce2326f82020e90e58e69cf2b54808c19b (diff) | |
| download | guix-4aabc8eaa22314b412d8c5517e05085aa1b38498.tar.gz guix-4aabc8eaa22314b412d8c5517e05085aa1b38498.zip | |
build: Install gnu/build/svg.scm.
Fixes a regression introduced in
commit 960887b2974ff5c3e63f58a1d89cd8d0dcb5e045.
* Makefile.am (MODULES_NOT_COMPILED): New variable.
(nobase_dist_guilemodule_DATA): Add $(MODULES_NOT_COMPILED).
(EXTRA_DIST): Remove gnu/build/svg.scm.
* gnu/local.mk (MODULES_NOT_COMPILED): New variable.
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | gnu/local.mk | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c75be9c842..426f8327d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,10 @@ nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env +# Modules that are not compiled but are installed nonetheless, such as +# build-side modules with unusual dependencies. +MODULES_NOT_COMPILED = + include gnu/local.mk MODULES = \ @@ -222,8 +226,8 @@ EXAMPLES = \ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) -nobase_dist_guilemodule_DATA = \ - $(MODULES) $(AUX_FILES) $(EXAMPLES) \ +nobase_dist_guilemodule_DATA = \ + $(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \ $(MISC_DISTRO_FILES) nobase_nodist_guilemodule_DATA = guix/config.scm nobase_nodist_guileobject_DATA = $(GOBJECTS) @@ -400,7 +404,6 @@ EXTRA_DIST = \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ - gnu/build/svg.scm \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ diff --git a/gnu/local.mk b/gnu/local.mk index 28ab73aed3..2017868891 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -475,6 +475,9 @@ GNU_SYSTEM_MODULES = \ %D%/tests/ssh.scm \ %D%/tests/web.scm +# Modules that do not need to be compiled. +MODULES_NOT_COMPILED += \ + %D%/build/svg.scm patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ |