>From d95720caa4136ad0d9688d42366fe951a27175df Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Tue, 5 Sep 2017 23:01:08 +1200 Subject: [PATCH] Use name from egg file when installing types and inline files This takes the inline and type file names from the correct keyword argument so that they can be overridden, and prefixes the installed filenames with the build's "srcdir" so that the install script uses absolute pathnames when calling install(1). --- egg-compile.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/egg-compile.scm b/egg-compile.scm index 6e6810a2..d12e95cb 100644 --- a/egg-compile.scm +++ b/egg-compile.scm @@ -609,8 +609,8 @@ srcdir platform) (let* ((cmd (install-file-command platform)) (mkdir (mkdir-command platform)) - (sname (prefix srcdir name)) - (out (quotearg (conc types-file ".types"))) + (sname (prefix srcdir types-file)) + (out (quotearg (conc sname ".types"))) (dest (destination-repository mode)) (dfile (quotearg (slashify dest platform))) (ddir (shell-variable "DESTDIR" platform))) @@ -623,8 +623,8 @@ srcdir platform) (let* ((cmd (install-file-command platform)) (mkdir (mkdir-command platform)) - (sname (prefix srcdir name)) - (out (quotearg (conc inline-file ".inline"))) + (sname (prefix srcdir inline-file)) + (out (quotearg (conc sname ".inline"))) (dest (destination-repository mode)) (dfile (quotearg (slashify dest platform))) (ddir (shell-variable "DESTDIR" platform))) -- 2.11.0