Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: /
Date: Thu, 26 Feb 2015 20:44:39
Message-Id: 1424979512.380662f1dec5c987a6039b8bc508f9dc0a17f138.dolsen@gentoo
1 commit: 380662f1dec5c987a6039b8bc508f9dc0a17f138
2 Author: W. Trevor King <wking <AT> tremily <DOT> us>
3 AuthorDate: Thu Jun 6 22:32:40 2013 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 26 19:38:32 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=380662f1
7
8 Makefile: Set PYTHONPATH=. for make_target_table.py
9
10 Avoid:
11
12 $ make
13 ...
14 "./doc/make_target_table.py" > "doc/targets.generated.txt"
15 Traceback (most recent call last):
16 File "./doc/make_target_table.py", line 34, in <module>
17 __import__(module_name)
18 ImportError: No module named catalyst.targets.embedded
19 make: *** [doc/targets.generated.txt] Error 1
20
21 This also ensures that the local catalyst package takes precedence
22 over any previously installed version.
23
24 ---
25 Makefile | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28 diff --git a/Makefile b/Makefile
29 index 57739d5..6f7eb10 100644
30 --- a/Makefile
31 +++ b/Makefile
32 @@ -31,7 +31,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
33 ./doc/make_subarch_table_guidexml.py
34
35 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
36 - "./$<" > "$@"
37 + PYTHONPATH=. "./$<" > "$@"
38
39 $(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
40 a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \