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.

1 files changed, 7 insertions, 3 deletions

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)