From bb3df205f2586c98cf7f4a1583e2865107f812e4 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Sat, 28 Aug 2004 05:37:52 +0000
Subject: [PATCH] Updated to work with non-absolute selfs again.

---
 src/conf.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/conf.py b/src/conf.py
index f221a3489..58b7094b7 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -539,11 +539,16 @@ class Directory(registry.String):
         return v
 
     def dirize(self, filename):
+        myself = self()
         if os.path.isabs(filename):
-            selfAbs = os.path.abspath(self())
+            filename = os.path.abspath(filename)
+            selfAbs = os.path.abspath(myself)
             commonPrefix = os.path.commonprefix([selfAbs, filename])
             filename = filename[len(commonPrefix)+1:] # +1 for extra /.
-        return os.path.join(self(), filename)
+        elif not os.path.isabs(myself):
+            if filename.startswith(myself):
+                filename = filename[len(myself):]
+        return os.path.join(myself, filename)
 
 class DataFilename(registry.String):
     def __call__(self):