1 | $NetBSD: patch-ab,v 1.3 2006/06/01 09:09:52 tonio Exp $ |
---|
2 | |
---|
3 | --- src/rules/latex/graphics.py.orig 2006-06-01 10:54:11.000000000 +0200 |
---|
4 | +++ src/rules/latex/graphics.py |
---|
5 | @@ -70,7 +70,7 @@ class Module (rubber.rules.latex.Module) |
---|
6 | doc.add_hook("DeclareGraphicsExtensions", self.declareExtensions) |
---|
7 | doc.add_hook("DeclareGraphicsRule", self.declareRule) |
---|
8 | |
---|
9 | - self.prefixes = map(lambda x: join(x, ""), doc.env.path) |
---|
10 | + self.prefixes = [] |
---|
11 | self.files = [] |
---|
12 | |
---|
13 | # I take dvips as the default, but it is not portable. |
---|
14 | @@ -130,7 +130,8 @@ class Module (rubber.rules.latex.Module) |
---|
15 | return 0 |
---|
16 | return 1 |
---|
17 | |
---|
18 | - d = self.env.convert(name, suffixes=suffixes, prefixes=self.prefixes, |
---|
19 | + d = self.env.convert(name, suffixes=suffixes, |
---|
20 | + prefixes=self.prefixes+[join(x,"") for x in self.env.path], |
---|
21 | check=check, pos=dict["pos"]) |
---|
22 | |
---|
23 | if d: |
---|
24 | @@ -211,7 +212,7 @@ class Module (rubber.rules.latex.Module) |
---|
25 | suffixes, and return either the complete path to the actual file or |
---|
26 | None if the file is not found. |
---|
27 | """ |
---|
28 | - for prefix in self.prefixes: |
---|
29 | + for prefix in self.prefixes+[join(x,"") for x in self.env.path]: |
---|
30 | test = prefix + name |
---|
31 | if exists(test): |
---|
32 | return test |
---|