commit:     380662f1dec5c987a6039b8bc508f9dc0a17f138
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:32:40 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:38:32 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=380662f1

Makefile: Set PYTHONPATH=. for make_target_table.py

Avoid:

  $ make
  ...
  "./doc/make_target_table.py" > "doc/targets.generated.txt"
  Traceback (most recent call last):
    File "./doc/make_target_table.py", line 34, in <module>
      __import__(module_name)
  ImportError: No module named catalyst.targets.embedded
  make: *** [doc/targets.generated.txt] Error 1

This also ensures that the local catalyst package takes precedence
over any previously installed version.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 57739d5..6f7eb10 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) 
doc/make_subarch_tab
        ./doc/make_subarch_table_guidexml.py
 
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard 
catalyst/targets/*.py)
-       "./$<" > "$@"
+       PYTHONPATH=. "./$<" > "$@"
 
 $(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
        a2x --conf-file=doc/asciidoc.conf 
--attribute="catalystversion=$(PACKAGE_VERSION)" \

Reply via email to