[svn r38621] * fix for linking problems: move future.txt one level up

* be slightly more defensive about apigen_relpath

--HG--
branch : trunk

py/doc/conftest.py

@@ -21,7 +21,7 @@ option = py.test.config.addoptions("documentation check options",
 ) 
 
 def get_apigen_relpath():
-    return py.test.config.option.apigen_relpath + "/"
+    return py.test.config.option.apigen_relpath.rstrip('\/') + "/"
 
 def deindent(s, sep='\n'):
     leastspaces = -1