~ chicken-core (chicken-5) b8473700db5d3270bbc2b44719fa82bf413bdb26

commit b8473700db5d3270bbc2b44719fa82bf413bdb26
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Sat Jan 6 14:49:09 2018 +1300
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Sat Jan 6 14:50:00 2018 +1300

    Use +egg-info-extension+ constant when building pathname in `matching-installed-files'
    
    Also, remove unused `setup-file-extension' constant in library.scm.

diff --git a/chicken-install.scm b/chicken-install.scm
index bfefdb30..94c62caf 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -538,7 +538,7 @@
 ;; check installed eggs for already installed files
 
 (define (matching-installed-files egg fnames)
-  (let ((eggs (glob (make-pathname (install-path) "*.egg-info"))))
+  (let ((eggs (glob (make-pathname (install-path) "*" +egg-info-extension+))))
     (let loop ((eggs eggs) (same '()))
       (cond ((null? eggs) same)
             ((string=? egg (pathname-file (car eggs)))
@@ -554,8 +554,7 @@
                 (loop (cdr eggs) (append (or mfiles '()) same))))))))
 
 (define (check-installed-files name info)
-  (let ((bad (matching-installed-files name
-                                       (cdr (assq 'installed-files info)))))
+  (let ((bad (matching-installed-files name (cdr (assq 'installed-files info)))))
     (unless (null? bad)
       (flush-output)
       (fprintf (current-error-port) 
diff --git a/egg-environment.scm b/egg-environment.scm
index ca7e2015..2bc4c6b2 100644
--- a/egg-environment.scm
+++ b/egg-environment.scm
@@ -91,7 +91,7 @@ EOF
 (define target-run-repo
   (string-append default-runlibdir "/chicken/" (number->string binary-version)))
 
-(define +egg-info-extension+ ".egg-info") 
+(define +egg-info-extension+ "egg-info")
 
 (define (destination-repository mode #!optional run)
   (if (eq? 'target mode)
diff --git a/library.scm b/library.scm
index 16eba473..221ea661 100644
--- a/library.scm
+++ b/library.scm
@@ -6345,8 +6345,6 @@ EOF
 
 ;;; Installation locations
 
-(define-constant setup-file-extension "egg-info")
-
 (define-foreign-variable binary-version int "C_BINARY_VERSION")
 (define-foreign-variable installation-home c-string "C_INSTALL_SHARE_HOME")
 (define-foreign-variable install-egg-home c-string "C_INSTALL_EGG_HOME")