From 6d8f5c5dc3db6d1aafeda58e2dd11a4db999a528 Mon Sep 17 00:00:00 2001 From: eknauel Date: Mon, 26 Jan 2004 09:53:46 +0000 Subject: [PATCH] small fixes --- pkg-def.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg-def.scm b/pkg-def.scm index a6e8045..a700aa6 100644 --- a/pkg-def.scm +++ b/pkg-def.scm @@ -19,7 +19,9 @@ (newline) (display make) (newline)) - (and (zero? (run ,configure)) (zero? (run ,make)) (exit)))) + (if (not (and (zero? (run ,configure)) + (zero? (run ,make)))) + (exit)))) (if (not (get-option-value 'non-shared-only)) (begin @@ -30,22 +32,20 @@ (let ((schemedir (get-directory 'scheme #f)) (libdir (get-directory 'lib #f)) (target-dir (get-directory 'base #t)) - (shared-ext (cdr (assoc 'shared-lib-extension config-data.scm))) + (shared-ext (cadr (assoc 'shared-module-extension config-data))) (sed-replace (lambda (from to) (string-append "s|" from "|" to "|g")))) (let ((cmd `(sed -e ,(sed-replace "@ypschemedir@" schemedir) -e ,(sed-replace "@yphost@" "(host)") -e ,(sed-replace "@yplibdir@" libdir) - -e ,(sed-replace "@sharedmoduleext@" - (cdr (assoc 'shared-module-extension - config-data.scm))) + -e ,(sed-replace "@sharedmoduleext@" shared-ext) "load.scm.in")) (tgt (string-append target-dir "/load.scm"))) (if (get-option-value 'dry-run) (begin (display cmd) (display " > ") (display tgt) (newline)) - (or (zero? (run ,cmd (> ,tgt))) (exit))))))) + (or (zero? (run ,cmd (> ,tgt))) (exit)))))))) (install-directory-contents "scheme" 'scheme) )