guile-lib - devel branch - patch 6 of 11

guile-lib - devel branch - patch 6 of 11

[David Pirotte]

[-- Attachment #1.1: Type: text/plain, Size: 42 bytes --]

guile-lib - devel branch - patch 6 of 11

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0006-Fixing-modules-and-go-files-install-location.patch --]
[-- Type: text/x-patch, Size: 2570 bytes --]

From c14a511b2d4d6f0271fef7dfe7c4904f00f23442 Mon Sep 17 00:00:00 2001
From: David Pirotte <david@altosw.be>
Date: Tue, 12 Jul 2016 21:43:22 -0300
Subject: [PATCH 06/11] Fixing modules and go files install location

* src/Makefile.am:  Use $(GUILE_GLOBAL_SITE) as the source code modules
  install location, $(GUILE_SITE_CCACHE) for the compiled files.
---
 src/Makefile.am | 47 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 65ee33b..dede64d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,32 @@
-moddir=$(prefix)/share/guile/site
+
+####
+#### Copyright (C) 2016 David Pirotte
+#### David Pirotte <david at altosw dot be>
+
+#### This file is part of Guile-Lib.
+
+#### Guile-Lib is free software: you can redistribute it, as a whole,
+#### and/or modify it under the terms of the GNU General Public
+#### License as published by the Free Software Foundation, either
+#### version 3 of the License, or (at your option) any later version.
+
+#### Each Guile-Lib module contained in Guile-Lib has its own copying
+#### conditions, specified in the comments at the beginning of the
+#### module's source file.
+
+#### Guile-Lib is distributed in the hope that it will be useful, but
+#### WITHOUT ANY WARRANTY; without even the implied warranty of
+#### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#### General Public License for more details.
+
+#### You should have received a copy of the GNU General Public License
+#### along with Guile-Lib.  If not, see
+#### <http://www.gnu.org/licenses/>.
+####
+
+
+moddir = $(GUILE_GLOBAL_SITE)
+godir= $(GUILE_SITE_CCACHE)
 
 SXML_FILES =					\
 	sxml/apply-templates.scm		\
@@ -40,7 +68,10 @@ SXML_SOURCES =
 TEXINFO_SOURCES =
 STATPROF_SOURCES =
 
-EXTRA_DIST = $(SXML_FILES) $(TEXINFO_FILES) $(STATPROF_FILES)
+EXTRA_DIST = \
+	$(SXML_FILES)		\
+	$(TEXINFO_FILES)	\
+	$(STATPROF_FILES)
 
 else !HAVE_GUILE_COMPILE
 
@@ -94,11 +125,19 @@ else
 GOBJECTS =
 endif
 
-nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS)
-EXTRA_DIST += $(SOURCES) $(NOCOMP_SOURCES)
+nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_go_DATA = $(GOBJECTS)
+
+EXTRA_DIST += \
+	$(SOURCES)		\
+	$(NOCOMP_SOURCES)
 
 CLEANFILES = $(GOBJECTS)
 
 SUFFIXES = .scm .go
 .scm.go:
 	$(top_builddir)/dev-environ $(GUILE_COMPILE) -o "$@" "$<"
+
+# to check/debug
+printenv:
+	printf '$(moddir)\n$(godir)\n'
-- 
2.8.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]