~ chicken-core (chicken-5) 2c81b811b8bb8024d0d52eda0544b833a889a639

commit 2c81b811b8bb8024d0d52eda0544b833a889a639
Merge: 909bf8ee f0e52333
Author:     felix <felix@y.(none)>
AuthorDate: Mon Apr 19 04:40:50 2010 +0200
Commit:     felix <felix@y.(none)>
CommitDate: Mon Apr 19 04:40:50 2010 +0200

    fixed conflicts

diff --cc manual/Extensions
index d9539102,eb392a3a..dc0bcc74
--- a/manual/Extensions
+++ b/manual/Extensions
@@@ -264,12 -264,18 +264,12 @@@ If the keyword argument {{c++}} is give
  Creates the directory given in the string {{PATH}}, with all parent directories as needed.
  
  
 -==== chicken-prefix
 -
 -<parameter>chicken-prefix</parameter>
 -
 -The installation prefix specified when CHICKEN was built.
 -
  ==== installation-prefix
  
- <parameter>installation-prefix</parameter>
+ <procedure>(installation-prefix)</procedure>
  
  An alternative installation prefix that will be prepended to extension
- installation paths if specified. It is set by the {{-install-prefix}}
+ installation paths if specified. It is set by the {{-prefix}}
  option or environment variable {{CHICKEN_INSTALL_PREFIX}}.
  
  ==== program-path
diff --cc setup-api.scm
index f4377721,f3ffd57f..93755ec9
--- a/setup-api.scm
+++ b/setup-api.scm
@@@ -470,8 -475,11 +477,13 @@@
      (run (,*copy-command* ,(shellpath from) ,(shellpath to)))
      to))
  
 +(define copy-file copy-file*)		;XXX DEPRECATED
 +
+ (define (path-prefix? pref path)
+   (string-prefix?
+    (normalize-pathname pref)
+    (normalize-pathname path)))
+ 
  (define (move-file from to)
    (let ((from  (if (pair? from) (car from) from))
  	(to    (if (pair? from) (make-pathname to (cadr from)) to)))