From: W. Trevor King <wking@tremily.us>
Date: Thu, 6 Jun 2013 22:32:40 +0000 (-0400)
Subject: Makefile: Set PYTHONPATH=. for make_target_table.py
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8989f9a1642dbe5db14e31693beafe566a0d019;p=catalyst.git

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.
---

diff --git a/Makefile b/Makefile
index 6f69e5c4..a130fb3a 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)" \