[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build: Install gnu/build/svg.scm.
From: |
Ludovic Courtès |
Subject: |
02/02: build: Install gnu/build/svg.scm. |
Date: |
Tue, 2 May 2017 09:55:07 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4aabc8eaa22314b412d8c5517e05085aa1b38498
Author: Ludovic Courtès <address@hidden>
Date: Tue May 2 15:43:01 2017 +0200
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.
---
Makefile.am | 9 ++++++---
gnu/local.mk | 3 +++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c75be9c..426f832 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 28ab73a..2017868 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 = \