From 117851a94a503f6d4fa305932b62495f944096d7 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Tue, 10 Jan 2012 04:02:29 +0100
Subject: [PATCH] get rid of the additional scripts dir in pythonpath

---
 SConstruct                                         | 1 -
 admin/{render_icon.py => scons/IconSvgRenderer.py} | 7 ++++---
 admin/scons/LumieraEnvironment.py                  | 2 +-
 admin/scons/Setup.py                               | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename admin/{render_icon.py => scons/IconSvgRenderer.py} (99%)

diff --git a/SConstruct b/SConstruct
index e081d9144..1f30f54f9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -30,7 +30,6 @@
 
 #-----------------------------------Configuration
 TOOLDIR      = './admin/scons'    # SCons plugins
-SCRIPTDIR    = './admin'
 #-----------------------------------Configuration
 
 
diff --git a/admin/render_icon.py b/admin/scons/IconSvgRenderer.py
similarity index 99%
rename from admin/render_icon.py
rename to admin/scons/IconSvgRenderer.py
index 63bacbf37..363b696ac 100755
--- a/admin/render_icon.py
+++ b/admin/scons/IconSvgRenderer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# render_icons.py  -  Icon rendering utility script
+# IconSvgRenderer.py  -  Icon rendering utility script
 #
 #  Copyright (C)         Lumiera.org
 #    2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -19,11 +19,12 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import os
 import sys
 import getopt
-from xml.dom import minidom
-import os
 import shutil
+from xml.dom import minidom
+
 
 #svgDir = "svg"
 #prerenderedDir = "prerendered"
diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py
index 1c314401b..100c83ca8 100644
--- a/admin/scons/LumieraEnvironment.py
+++ b/admin/scons/LumieraEnvironment.py
@@ -123,7 +123,7 @@ def register_LumieraResourceBuilder(env):
         used to generate png from the svg source using librsvg. 
     """
     
-    import render_icon as renderer  # load Joel's python script for invoking the rsvg-convert (SVG render)
+    import IconSvgRenderer as renderer  # load Joel's python script for invoking the rsvg-convert (SVG render)
     renderer.rsvgPath = env.subst("$TARGDIR/rsvg-convert")
     
     def invokeRenderer(target, source, env):
diff --git a/admin/scons/Setup.py b/admin/scons/Setup.py
index 23112a09b..976232198 100644
--- a/admin/scons/Setup.py
+++ b/admin/scons/Setup.py
@@ -32,7 +32,6 @@
 TARGDIR      = 'target'
 VERSION      = '0.pre.01'
 TOOLDIR      = './admin/scons'    # SCons plugins
-SCRIPTDIR    = './admin'
 OPTCACHE     = 'optcache' 
 CUSTOPTFILE  = 'custom-options'