From 65b510bbc4f2a9ce5bfe3355e6006e9d08f14532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 15 Jan 2020 23:38:35 +0100
Subject: [PATCH] clojure-utils: Avoid use of '@@'.

* guix/build/clojure-utils.scm (%doc-regex): Avoid @@, which doesn't
work on Guile 3.
(file-sans-extension): Likewise.
---
 guix/build/clojure-utils.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm
index 9f7334bc8d..a9ffad3c8f 100644
--- a/guix/build/clojure-utils.scm
+++ b/guix/build/clojure-utils.scm
@@ -69,10 +69,7 @@
 
 (define-with-docs %doc-regex
   "Default regex for matching the base name of top-level documentation files."
-  (format #f
-          "(~a)|(\\.(html|markdown|md|txt)$)"
-          (@@ (guix build guile-build-system)
-              %documentation-file-regexp)))
+  "^(README.*|.*\\.html|.*\\.org|.*\\.md|\\.markdown|\\.txt)$")
 
 (define* (install-doc #:key
                       doc-dirs
@@ -185,10 +182,12 @@ canonicalized."
          (apply find-files "./" args))))
 
 ;;; FIXME: should be moved to (guix build utils)
-(define-with-docs file-sans-extension
-  "Strip extension from path, if any."
-  (@@ (guix build guile-build-system)
-      file-sans-extension))
+(define (file-sans-extension file)                ;TODO: factorize
+  "Return the substring of FILE without its extension, if any."
+  (let ((dot (string-rindex file #\.)))
+    (if dot
+        (substring file 0 dot)
+        file)))
 
 (define (relative-path->clojure-lib-string path)
   "Convert PATH to a clojure library string."