From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-lib - devel branch - patch 6 of 11 Date: Fri, 15 Jul 2016 22:48:45 -0300 Message-ID: <20160715224845.72a39093@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Nu=I1JhdIj/zroP=8FwytT/"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1468633769 6859 80.91.229.3 (16 Jul 2016 01:49:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jul 2016 01:49:29 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Jul 16 03:49:21 2016 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bOEjJ-00050X-0t for guile-devel@m.gmane.org; Sat, 16 Jul 2016 03:49:21 +0200 Original-Received: from localhost ([::1]:35598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOEjI-0006Vo-1y for guile-devel@m.gmane.org; Fri, 15 Jul 2016 21:49:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOEiu-0006UR-Rz for guile-devel@gnu.org; Fri, 15 Jul 2016 21:48:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bOEir-0003JG-MB for guile-devel@gnu.org; Fri, 15 Jul 2016 21:48:56 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:34278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOEir-0003JC-BY for guile-devel@gnu.org; Fri, 15 Jul 2016 21:48:53 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id CF667A04C143 for ; Sat, 16 Jul 2016 03:48:52 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id RaBOq5veWOl3 for ; Sat, 16 Jul 2016 03:48:47 +0200 (CEST) Original-Received: from capac (unknown [177.17.12.124]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 6F813A04C141 for ; Sat, 16 Jul 2016 03:48:47 +0200 (CEST) X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:18515 Archived-At: --Sig_/Nu=I1JhdIj/zroP=8FwytT/ Content-Type: multipart/mixed; boundary="MP_/LuzLcvXHEa0+BH2Rt0JJ4lR" --MP_/LuzLcvXHEa0+BH2Rt0JJ4lR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline guile-lib - devel branch - patch 6 of 11 --MP_/LuzLcvXHEa0+BH2Rt0JJ4lR Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0006-Fixing-modules-and-go-files-install-location.patch =46rom c14a511b2d4d6f0271fef7dfe7c4904f00f23442 Mon Sep 17 00:00:00 2001 From: David Pirotte 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=3D$(prefix)/share/guile/site + +#### +#### Copyright (C) 2016 David Pirotte +#### David Pirotte + +#### 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 +#### . +#### + + +moddir =3D $(GUILE_GLOBAL_SITE) +godir=3D $(GUILE_SITE_CCACHE) =20 SXML_FILES =3D \ sxml/apply-templates.scm \ @@ -40,7 +68,10 @@ SXML_SOURCES =3D TEXINFO_SOURCES =3D STATPROF_SOURCES =3D =20 -EXTRA_DIST =3D $(SXML_FILES) $(TEXINFO_FILES) $(STATPROF_FILES) +EXTRA_DIST =3D \ + $(SXML_FILES) \ + $(TEXINFO_FILES) \ + $(STATPROF_FILES) =20 else !HAVE_GUILE_COMPILE =20 @@ -94,11 +125,19 @@ else GOBJECTS =3D endif =20 -nobase_mod_DATA =3D $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS) -EXTRA_DIST +=3D $(SOURCES) $(NOCOMP_SOURCES) +nobase_mod_DATA =3D $(SOURCES) $(NOCOMP_SOURCES) +nobase_go_DATA =3D $(GOBJECTS) + +EXTRA_DIST +=3D \ + $(SOURCES) \ + $(NOCOMP_SOURCES) =20 CLEANFILES =3D $(GOBJECTS) =20 SUFFIXES =3D .scm .go .scm.go: $(top_builddir)/dev-environ $(GUILE_COMPILE) -o "$@" "$<" + +# to check/debug +printenv: + printf '$(moddir)\n$(godir)\n' --=20 2.8.1 --MP_/LuzLcvXHEa0+BH2Rt0JJ4lR-- --Sig_/Nu=I1JhdIj/zroP=8FwytT/ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXiZJ9AAoJEPN0/ZOjBXrXvxwIAKaz1fLHCMLFz7L+fsGdE0Hk wHHT2vkRb3mAbzIGzVEN7yHgbj6IWupl5Bo1Q7NKxb4VOK3VI/kSJhVa24kaV6op uKimOWyJWNYWbc5P6BPt9cfGruVsGuLD/9eTzmivUPxuFOyPDVG5vFtRQ2/igOUY wHef3lAAlBwwO/g6JLVfyN26Q749PvoTzjuSVJbha3dhbK6pssH1QfJvaw8OHJZc EUgqzaTBryyJyitPanBu9KZRE15crlg0mr1MPF6wHzN0F8cqcZNMJhn7X8QWrtT4 mNazZkKTHSdHZQzI7dEy+VWC5rP3DvthymIg0MemfbJ58A3pl0Ho9jCbTTJJ77c= =R2W7 -----END PGP SIGNATURE----- --Sig_/Nu=I1JhdIj/zroP=8FwytT/--