~ chicken-core (chicken-5) d150545c29cc0d84d526f5cfa8bcf72852c44d4b

commit d150545c29cc0d84d526f5cfa8bcf72852c44d4b
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Dec 10 20:56:25 2016 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Dec 10 20:56:25 2016 +0100

    renamed some vars in egg-environment for more consistency

diff --git a/egg-compile.scm b/egg-compile.scm
index 8dc21901..a057258a 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -127,7 +127,7 @@
                       (files '()))
             (for-each compile-data/include (cddr info))
             (let* ((dest (or dest 
-                             (if (eq? mode 'target) target-sharedir host-sharedir)))
+                             (if (eq? mode 'target) default-sharedir host-sharedir)))
                    (dest (normalize-pathname (conc dest "/"))))
               (addfiles (map (cut conc dest <>) files)))
             (set! data
@@ -151,7 +151,7 @@
                       (files '()))
             (for-each compile-data/include (cddr info))
             (let* ((dest (or dest 
-                             (if (eq? mode 'target) target-incdir host-incdir)))
+                             (if (eq? mode 'target) default-incdir host-incdir)))
                    (dest (normalize-pathname (conc dest "/"))))
               (addfiles (map (cut conc dest <>) files)))
             (set! cinc
@@ -164,7 +164,7 @@
                       (files '()))
             (for-each compile-data/include (cddr info))
             (let* ((dest (or dest
-                             (if (eq? mode 'target) target-sharedir host-sharedir)))
+                             (if (eq? mode 'target) default-sharedir host-sharedir)))
                    (dest (normalize-pathname (conc dest "/"))))
               (addfiles (map (cut conc dest <>) files)))
             (set! scminc 
@@ -180,7 +180,7 @@
                       (lopts '())
                       (opts '()))
             (for-each compile-extension/program (cddr info))
-            (let ((dest (if (eq? mode 'target) target-bindir host-bindir)))
+            (let ((dest (if (eq? mode 'target) default-bindir host-bindir)))
               (addfiles (list (conc dest "/" target exeext))))
             (set! prgs 
               (cons (list target dependencies: deps source: src options: opts 
@@ -485,7 +485,7 @@
          (ext (executable-extension platform))
          (sname (prefix srcdir name))
          (out (quotearg (target-file (conc sname ext) mode)))
-         (dest (if (eq? mode 'target) target-bindir host-bindir))
+         (dest (if (eq? mode 'target) default-bindir host-bindir))
          (dfile (quotearg (slashify dest platform)))
          (ddir (shell-variable "DESTDIR" platform))
          (destf (quotearg (slashify (conc dest "/" name ext) platform))))
@@ -497,7 +497,7 @@
 (define ((install-data name #!key files destination mode) srcdir platform)
   (let* ((cmd (install-file-command platform))
          (mkdir (mkdir-command platform))
-         (dest (or destination (if (eq? mode 'target) target-sharedir host-sharedir)))
+         (dest (or destination (if (eq? mode 'target) default-sharedir host-sharedir)))
          (dfile (quotearg (slashify dest platform)))
          (ddir (shell-variable "DESTDIR" platform)))
     (print "\n" mkdir " " ddir dfile)
@@ -506,7 +506,7 @@
 (define ((install-c-include name #!key deps files destination mode) srcdir platform)
   (let* ((cmd (install-file-command platform))
          (mkdir (mkdir-command platform))
-         (dest (or destination (if (eq? mode 'target) target-incdir host-incdir)))
+         (dest (or destination (if (eq? mode 'target) default-incdir host-incdir)))
          (dfile (quotearg (slashify dest platform)))
          (ddir (shell-variable "DESTDIR" platform)))
     (print "\n" mkdir " " ddir dfile)
diff --git a/egg-environment.scm b/egg-environment.scm
index c69bdad1..ef8c87b9 100644
--- a/egg-environment.scm
+++ b/egg-environment.scm
@@ -25,10 +25,12 @@ EOF
 (define default-cflags (foreign-value "C_TARGET_CFLAGS" c-string))
 (define default-ldflags (foreign-value "C_TARGET_LDFLAGS" c-string))
 (define default-libs (foreign-value "C_TARGET_MORE_LIBS" c-string))
-(define default-slibs (foreign-value "C_TARGET_MORE_STATIC_LIBS" c-string))
 (define default-libdir (foreign-value "C_TARGET_LIB_HOME" c-string))
 (define default-slibdir (foreign-value "C_TARGET_STATIC_LIB_HOME" c-string))
 (define default-incdir (foreign-value "C_TARGET_INCLUDE_HOME" c-string))
+(define default-bindir (foreign-value "C_TARGET_BIN_HOME" c-string))
+(define default-incdir (foreign-value "C_TARGET_INCLUDE_HOME" c-string))
+(define default-sharedir (foreign-value "C_TARGET_SHARE_HOME" c-string))
 
 (define default-platform
   (if (eq? (software-type) 'windows)
@@ -48,17 +50,19 @@ EOF
   (make-pathname default-bindir (foreign-value "C_CHICKEN_DO_PROGRAM" c-string)))
 
 (define host-repo (foreign-value "C_INSTALL_EGG_HOME" c-string))
+(define host-libdir (foreign-value "C_INSTALL_LIB_HOME" c-string))
 (define host-bindir (foreign-value "C_INSTALL_BIN_HOME" c-string))
 (define host-incdir (foreign-value "C_INSTALL_INCLUDE_HOME" c-string))
 (define host-sharedir (foreign-value "C_INSTALL_SHARE_HOME" c-string))
+(define host-libs (foreign-value "C_INSTALL_MORE_LIBS" c-string))
+(define host-cflags (foreign-value "C_INSTALL_CFLAGS" c-string))
+(define host-ldflags (foreign-value "C_INSTALL_LDFLAGS" c-string))
+(define host-cc (foreign-value "C_INSTALL_CC" c-string))
+(define host-cxx (foreign-value "C_INSTALL_CXX" c-string))
 
 (define target-repo
   (string-append default-libdir "/chicken/" (number->string binary-version)))
 
-(define target-bindir (foreign-value "C_TARGET_BIN_HOME" c-string))
-(define target-incdir (foreign-value "C_TARGET_INCLUDE_HOME" c-string))
-(define target-sharedir (foreign-value "C_TARGET_SHARE_HOME" c-string))
-
 (define +egg-info-extension+ ".egg-info") 
 
 (define (destination-repository mode)