From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 28 Nov 2018 07:48:33 +0000 (-0700)
Subject: ffi/build: Fix a bug mixing pathnames and strings.
X-Git-Tag: mit-scheme-pucked-10.1.2~6
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=88fb6efb56ab96c5693c1aafa1e7c99741c61801;p=mit-scheme.git

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

diff --git a/src/ffi/build.scm b/src/ffi/build.scm
index 5e66da772..40d71368b 100644
--- 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))))
 
 (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)