~ chicken-core (chicken-5) 71c74491a1c839aa509f188a04a49f675398baa1

commit 71c74491a1c839aa509f188a04a49f675398baa1
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Sat Apr 29 19:10:45 2017 +1200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Sat Apr 29 19:25:05 2017 +1200

    Fix makedist.scm after new-egg-install changes

diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index 2bf80f9f..4cfd52d3 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -1,7 +1,8 @@
 ;;;; makedist.scm - Make distribution tarballs
 
 
-(use data-structures files irregex posix setup-api
+(use data-structures files irregex posix
+     (chicken format)
      (chicken io)
      (chicken pathname)
      (chicken platform)
@@ -47,12 +48,18 @@
 	    (list fs) ) )
    equal?) )
 
+(define (run . args)
+  (let ((cmd (apply format args)))
+    (display cmd (current-error-port))
+    (newline (current-error-port))
+    (system* cmd)))
+
 (define (release full?)
   (let* ((files (with-input-from-file "distribution/manifest" read-lines))
 	 (distname (conc "chicken-" BUILDVERSION)) 
 	 (distfiles (map (cut prefix distname <>) files)) 
 	 (tgz (conc distname ".tar.gz")))
-    (run (rm -fr ,distname ,tgz))
+    (run "rm -fr ~a ~a" distname tgz)
     (create-directory distname)
     (for-each
      (lambda (d)
@@ -65,14 +72,14 @@
 	   (foldl (lambda (missing f)
 		    (cond
 		     ((file-exists? f)
-		      (run (cp -p ,(qs f) ,(qs (make-pathname distname f))))
+		      (run "cp -p ~a ~a" (qs f) (qs (make-pathname distname f)))
 		      missing)
 		     (else (cons f missing))))
 		  '() files)))
       (unless (null? missing)
 	(warning "files missing" missing) ) )
-    (run (tar cfz ,(conc distname ".tar.gz") ,distname))
-    (run (rm -fr ,distname)) ) )
+    (run "tar cfz ~a ~a" (conc distname ".tar.gz") distname)
+    (run "rm -fr ~a" distname)))
 
 (define (usage)
   (print "usage: makedist [-release] [-make PROGRAM] [--platform=PLATFORM] MAKEOPTION ...")
@@ -96,6 +103,6 @@
 		 (loop (cddr args)))
 		(else (cons arg (loop (cdr args)))))))))
 
-(run (,*make* -f ,(conc "Makefile." *platform*) distfiles ,@*makeargs*))
+(run "~a -f Makefile.~a distfiles ~a" *make* *platform* (string-intersperse *makeargs*))
 
 (release *release*)