From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8DF53138247 for ; Fri, 22 Nov 2013 07:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A766E0949; Fri, 22 Nov 2013 07:13:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 660F7E0949 for ; Fri, 22 Nov 2013 07:13:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6837233F327 for ; Fri, 22 Nov 2013 07:13:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 48799D0122 for ; Fri, 22 Nov 2013 07:13:28 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1385100156.5619ec23f1969e0eacf2a1cb0057a38f434c4f46.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:rewrite-on-master commit in: / X-VCS-Repository: proj/catalyst X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5619ec23f1969e0eacf2a1cb0057a38f434c4f46 X-VCS-Branch: rewrite-on-master Date: Fri, 22 Nov 2013 07:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4a99cfbd-b428-485b-baab-84ce44ec3a42 X-Archives-Hash: efef4a088859c0fc5536ca5a470ceae8 commit: 5619ec23f1969e0eacf2a1cb0057a38f434c4f46 Author: W. Trevor King tremily us> AuthorDate: Thu Jun 6 22:32:40 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Nov 22 06:02:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5619ec23 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 __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 6f69e5c..a130fb3 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)" \