~ chicken-core (chicken-5) a1da96ffa0992e25013d7f242017ef137369e799
commit a1da96ffa0992e25013d7f242017ef137369e799 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Wed May 17 08:32:49 2017 +0200 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Wed May 17 08:32:49 2017 +0200 Previously, "install-inline-file" installed the inline file in place of the types one, rather than to the correct path. Also remove the executable bit when installing files that have no reason to have it. Submitted by LemonBoy <thatlemon@gmail.com> Signed-off-by: Evan Hanson <evhan@foldling.org> Signed-off-by: Felix Winkelmann <felix@call-with-current-continuation.org> diff --git a/egg-compile.scm b/egg-compile.scm index 0567c986..4d7332c0 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -555,7 +555,7 @@ (define ((install-import-library-source name #!key mode output-file) srcdir platform) - (let* ((cmd (install-executable-command platform)) + (let* ((cmd (install-file-command platform)) (mkdir (mkdir-command platform)) (sname (prefix srcdir name)) (out (quotearg (target-file (conc sname ".import.scm") mode))) @@ -569,7 +569,7 @@ (define ((install-types-file name #!key mode types-file) srcdir platform) - (let* ((cmd (install-executable-command platform)) + (let* ((cmd (install-file-command platform)) (mkdir (mkdir-command platform)) (sname (prefix srcdir name)) (out (quotearg (conc types-file ".types"))) @@ -583,7 +583,7 @@ (define ((install-inline-file name #!key mode inline-file) srcdir platform) - (let* ((cmd (install-executable-command platform)) + (let* ((cmd (install-file-command platform)) (mkdir (mkdir-command platform)) (sname (prefix srcdir name)) (out (quotearg (conc inline-file ".inline"))) @@ -592,7 +592,7 @@ (ddir (shell-variable "DESTDIR" platform))) (print "\n" mkdir " " ddir dfile) (print cmd " " out " " ddir - (quotearg (slashify (conc dest "/" inline-file ".types") + (quotearg (slashify (conc dest "/" inline-file ".inline") platform))))) (define ((install-program name #!key mode output-file) srcdir platform)Trap