From b0d935bbf97a9b35b03ffb391f4a2f4cfe3adf44 Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Sat, 7 Mar 2009 22:03:38 +0000
Subject: [PATCH] Info files are now stored in the `info/' subdirectory of the
 Edwin system library directory.  Reflect this in EDWIN-INFO-DIRECTORY.

---
 v7/src/edwin/paths.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/v7/src/edwin/paths.scm b/v7/src/edwin/paths.scm
index d39800573..b59fac375 100644
--- a/v7/src/edwin/paths.scm
+++ b/v7/src/edwin/paths.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: paths.scm,v 1.23 2008/01/30 20:02:04 cph Exp $
+$Id: paths.scm,v 1.24 2009/03/07 22:03:38 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -41,7 +41,10 @@ USA.
   (edwin-library-directory-pathname "EDWIN_BINARY_DIRECTORY" #t))
 
 (define (edwin-info-directory)
-  (edwin-library-directory-pathname "EDWIN_INFO_DIRECTORY" #f))
+  (let ((pathname
+	 (edwin-library-directory-pathname "EDWIN_INFO_DIRECTORY" #f)))
+    (and pathname
+	 (merge-pathnames "info" (pathname-as-directory pathname)))))
 
 (define (edwin-etc-directory)
   (edwin-library-directory-pathname "EDWIN_ETC_DIRECTORY" #t))
-- 
2.25.1