From 18510f07e9fb411ff9117649ca69394ca8a19cdc Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Wed, 20 Aug 2008 15:12:00 +0200
Subject: [PATCH] Add buildscripts/ to PYTHONPATH

---
 Documentation/GNUmakefile           |  6 +++---
 GNUmakefile.in                      |  2 +-
 buildscripts/check_translation.py   | 12 ++++++------
 buildscripts/translations-status.py |  6 +-----
 buildscripts/www_post.py            | 14 ++++++--------
 make/generic-vars.make              |  1 +
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 447337efc9..53243aa542 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -86,14 +86,14 @@ fix-xrefs:
 	$(DOCUMENTS_INCLUDES) $(buildscript-dir)/manuals_definitions.py
 
 check-translation:
-	$(PYTHON) $(buildscript-dir)/check_translation.py $(buildscript-dir) $(CHECKED_FILES)
+	$(PYTHON) $(buildscript-dir)/check_translation.py $(CHECKED_FILES)
 
 update-translation:
-	$(PYTHON) $(buildscript-dir)/check_translation.py --update $(buildscript-dir) $(CHECKED_FILES)
+	$(PYTHON) $(buildscript-dir)/check_translation.py --update $(CHECKED_FILES)
 
 translation-status:
 	make -C po out=www messages
-	$(PYTHON) $(buildscript-dir)/translations-status.py $(buildscript-dir)
+	$(PYTHON) $(buildscript-dir)/translations-status.py
 
 local-help: extra-local-help
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index cec5d29937..aa7d227c59 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -87,7 +87,7 @@ WWW-post:
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
-	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
+	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
 	find $(outdir)/offline-root -type l -delete
 
 
diff --git a/buildscripts/check_translation.py b/buildscripts/check_translation.py
index a0ac7d48cc..887e7c210b 100755
--- a/buildscripts/check_translation.py
+++ b/buildscripts/check_translation.py
@@ -5,6 +5,9 @@ import optparse
 import os
 import sys
 
+import langdefs
+import buildlib
+
 verbose = 0
 lang = 'C'
 C = lang
@@ -53,7 +56,7 @@ def do_file (file_name, lang_codes, buildlib):
 def usage ():
     sys.stdout.write (r'''
 Usage:
-check-translation [--language=LANG] [--verbose] [--update] BUILDSCRIPT-DIR FILE...
+check-translation [--language=LANG] [--verbose] [--update] FILE...
 
 This script is licensed under the GNU GPL.
 ''')
@@ -83,20 +86,17 @@ def do_options ():
     lang = options.language
     update_mode = options.update_mode
     
-    return (files[0], files[1:])
+    return files
 
 def main ():
     global update_mode, text_editor
 
-    import_path, files = do_options ()
+    files = do_options ()
     if 'EDITOR' in os.environ:
         text_editor = os.environ['EDITOR']
     else:
         update_mode = False
     
-    sys.path.append (import_path)
-    import langdefs
-    import buildlib
     buildlib.verbose = verbose
 
     for i in files:
diff --git a/buildscripts/translations-status.py b/buildscripts/translations-status.py
index 1c62ee56d2..4180ea8672 100755
--- a/buildscripts/translations-status.py
+++ b/buildscripts/translations-status.py
@@ -19,19 +19,15 @@ import string
 import os
 
 import langdefs
+import buildlib
 
 def progress (str):
     sys.stderr.write (str + '\n')
 
 progress ("translations-status.py")
 
-buildscript_dir = sys.argv[1]
-
 _doc = lambda s: s
 
-sys.path.append (buildscript_dir)
-import buildlib
-
 # load gettext messages catalogs
 translation = langdefs.translation
 
diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py
index b05e5e2011..146f8955b8 100644
--- a/buildscripts/www_post.py
+++ b/buildscripts/www_post.py
@@ -10,7 +10,12 @@ import sys
 import os
 import re
 
-package_name, package_version, buildscript_dir, outdir, targets = sys.argv[1:]
+import langdefs
+
+import mirrortree
+import add_html_footer
+
+package_name, package_version, outdir, targets = sys.argv[1:]
 targets = targets.split (' ')
 outdir = os.path.normpath (outdir)
 doc_dirs = ['input', 'Documentation', outdir]
@@ -29,8 +34,6 @@ static_files = {
 <html><body>Redirecting to the documentation index...</body></html>\n'''
     }
 
-import langdefs
-
 for l in langdefs.LANGUAGES:
     static_files[os.path.join ('Documentation', 'user', outdir, l.file_name ('index', '.html'))] = \
                                   '<META HTTP-EQUIV="refresh" content="0;URL=../' + l.file_name ('index', '.html') + \
@@ -39,11 +42,6 @@ for l in langdefs.LANGUAGES:
 for f, contents in static_files.items ():
     open (f, 'w').write (contents)
 
-
-sys.path.append (buildscript_dir)
-import mirrortree
-import add_html_footer
-
 sys.stderr.write ("Mirrorring...\n")
 dirs, symlinks, files = mirrortree.walk_tree (
     tree_roots = doc_dirs,
diff --git a/make/generic-vars.make b/make/generic-vars.make
index 201a9ea7a4..428e5b900a 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -18,6 +18,7 @@ mi2mu-dir = $(src-depth)/mi2mu
 make-dir = $(src-depth)/make
 include-flower = $(src-depth)/flower/include
 
+export PYTHONPATH:=$(buildscript-dir):$(PYTHONPATH)
 
 LILYPOND_INCLUDES = $(include-flower) $(depth)/flower/$(outdir)
 
-- 
2.39.2