[gnunet-scheme] 265/324: build: Find .scmfrag files when building out-of-tree.

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 3d0950a19958b6e4526680f5452f8008a46a218f
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sat Sep 11 12:49:42 2021 +0200

    build: Find .scmfrag files when building out-of-tree.
    
    * Makefile.am
      (E): New variable.
      (nobase_dist_guilesite_DATA): Add .scmfrag files and protocols
      .scmgen.
    * gnu/gnunet/message/protocols.scm
      (the-library-form): Search for files in %load-path.
---
 Makefile.am                      | 40 ++++++++++++++++++++++++++++++++++++++++
 gnu/gnunet/message/protocols.scm | 10 +++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bfe4392..0282676 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,46 @@ modules = \
 GOBJECTS = $(modules:%.scm=%.go)
 nobase_dist_guilesite_DATA = $(modules)
 
+E = gnu/gnunet/message/enum-
+nobase_dist_guilesite_DATA += \
+  gnu/gnunet/message/protocols.scmgen \
+  $(E)agpl.scmfrag \
+  $(E)arm.scmfrag \
+  $(E)ats.scmfrag \
+  $(E)chat.scmfrag \
+  $(E)consensus.scmfrag \
+  $(E)conversation.scmfrag \
+  $(E)core.scmfrag \
+  $(E)datastore.scmfrag \
+  $(E)dht.scmfrag \
+  $(E)fragment.scmfrag \
+  $(E)fs-publish.scmfrag \
+  $(E)fs.scmfrag \
+  $(E)gns.scmfrag \
+  $(E)hello.scmfrag \
+  $(E)identity.scmfrag \
+  $(E)lockmanager.scmfrag \
+  $(E)multicast.scmfrag \
+  $(E)namecache.scmfrag \
+  $(E)namestore.scmfrag \
+  $(E)nse.scmfrag \
+  $(E)peerinfo.scmfrag \
+  $(E)psyc.scmfrag \
+  $(E)psycstore.scmfrag \
+  $(E)regex.scmfrag \
+  $(E)resolver.scmfrag \
+  $(E)revocation.scmfrag \
+  $(E)scalarproduct.scmfrag \
+  $(E)set.scmfrag \
+  $(E)statistics.scmfrag \
+  $(E)testbed.scmfrag \
+  $(E)transport-dv.scmfrag \
+  $(E)transport.scmfrag \
+  $(E)util.scmfrag \
+  $(E)vpn-dns.scmfrag \
+  $(E)vpn.scmfrag \
+  $(E)wlan.scmfrag
+
 # Scheme code compilation
 if HAVE_GUILD
 nobase_nodist_guilesiteccache_DATA = $(GOBJECTS)
diff --git a/gnu/gnunet/message/protocols.scm b/gnu/gnunet/message/protocols.scm
index efbfb2d..c0c7e2f 100644
--- a/gnu/gnunet/message/protocols.scm
+++ b/gnu/gnunet/message/protocols.scm
@@ -20,14 +20,18 @@
              (lambda (s)
                (let ()
                  (define (include/sexp name)
-                   (call-with-input-file
-                       (string-append (dirname (current-filename)) "/" name)
+                   (define file
+                     (search-path %load-path
+                                  (string-append "gnu/gnunet/message/" name)))
+                   (call-with-input-file file
                      (lambda (port)
                        (let loop ()
                          (let ((obj (read port)))
                            (if (eof-object? obj)
                                '()
                                (cons obj (loop))))))))
-                 (include "protocols.scmgen")
+                 ;; Do this instead of (include "protocols.scmgen") to placate
+                 ;; "make distcheck".
+                 (include-from-path "gnu/gnunet/message/protocols.scmgen")
                  (datum->syntax s result)))))
   the-library-form)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.