scsh-conservatory
/
scsh-yp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

This commit is contained in:
eknauel 2004-01-26 09:53:46 +00:00
parent e52a9c88bd
commit 6d8f5c5dc3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg-def.scm
View File

@ -19,7 +19,9 @@
(newline) (newline)
(display make) (display make)
(newline)) (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)) (if (not (get-option-value 'non-shared-only))
(begin (begin
@ -30,22 +32,20 @@
(let ((schemedir (get-directory 'scheme #f)) (let ((schemedir (get-directory 'scheme #f))
(libdir (get-directory 'lib #f)) (libdir (get-directory 'lib #f))
(target-dir (get-directory 'base #t)) (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) (sed-replace (lambda (from to)
(string-append "s|" from "|" to "|g")))) (string-append "s|" from "|" to "|g"))))
(let ((cmd `(sed -e ,(sed-replace "@ypschemedir@" schemedir) (let ((cmd `(sed -e ,(sed-replace "@ypschemedir@" schemedir)
-e ,(sed-replace "@yphost@" "(host)") -e ,(sed-replace "@yphost@" "(host)")
-e ,(sed-replace "@yplibdir@" libdir) -e ,(sed-replace "@yplibdir@" libdir)
-e ,(sed-replace "@sharedmoduleext@" -e ,(sed-replace "@sharedmoduleext@" shared-ext)
(cdr (assoc 'shared-module-extension
config-data.scm)))
"load.scm.in")) "load.scm.in"))
(tgt (string-append target-dir "/load.scm"))) (tgt (string-append target-dir "/load.scm")))
(if (get-option-value 'dry-run) (if (get-option-value 'dry-run)
(begin (begin
(display cmd) (display " > ") (display tgt) (display cmd) (display " > ") (display tgt)
(newline)) (newline))
(or (zero? (run ,cmd (> ,tgt))) (exit))))))) (or (zero? (run ,cmd (> ,tgt))) (exit))))))))
(install-directory-contents "scheme" 'scheme) (install-directory-contents "scheme" 'scheme)
) )