ffi/build: Fix a bug mixing pathnames and strings.

diff --git a/src/ffi/build.scm b/src/ffi/build.scm
index 5e66da772611492559784fed8fca21a17689df60..40d71368b007f050e131d8f8af4bf0612f01f0cb 100644 (file)
--- a/src/ffi/build.scm
+++ b/src/ffi/build.scm
@@ -69,12 +69,13 @@ USA.
 
 (define (normal-dirname dirname)
   (and dirname
-       (not (string-null? dirname))
+       (not (and (string? dirname)
+                (string-null? dirname)))
        (->namestring (pathname-as-directory dirname))))
 \f
 (define (update-plugin-lib operation name project scmlibdir)
   (declare (ignore project))
-  (if (file-exists? (merge-pathnames "optiondb.scm" scmlibdir))
+  (if (file-exists? (string scmlibdir"optiondb.scm"))
       ;; NOT in dpkg-buildpackage's chroot
       (update-optiondb (update-plugins-file operation name scmlibdir)
                       scmlibdir)))
@@ -85,13 +86,13 @@ USA.
     (update-html-index project plugins scmdocdir)))
 
 (define (read-plugins-file dir)
-  (let ((filename (merge-pathnames "plugins.scm" dir)))
+  (let ((filename (string dir"plugins.scm")))
     (if (file-exists? filename)
        (call-with-input-file filename read)
        '())))
 
 (define (update-plugins-file operation name dir)
-  (let ((filename (merge-pathnames "plugins.scm" dir)))
+  (let ((filename (string dir"plugins.scm")))
     (if (file-exists? filename)
        (rewrite-file filename
          (lambda (in out)