From: W. Trevor King <wking@drexel.edu>
Date: Wed, 28 Apr 2010 21:11:57 +0000 (-0400)
Subject: Only add DISPLAY to the SCons build environment if the user has set it
X-Git-Tag: v1.0~405
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c6e307a2dceb6b6fd78bffcf23964e842a784ec;p=thesis.git

Only add DISPLAY to the SCons build environment if the user has set it
---

diff --git a/tex/src/SConscript b/tex/src/SConscript
index ce08fd4..550974d 100644
--- a/tex/src/SConscript
+++ b/tex/src/SConscript
@@ -8,11 +8,13 @@ from site_cons.site_tools import asymptote, gnuplot
 env = Environment(ENV={
     'PATH':['/usr/local/bin', '/opt/bin', '/bin', '/usr/bin'],
     'HOME':os.path.expanduser('~'),
-    'DISPLAY':os.environ['DISPLAY'],
     'PYMOL_PATH':'/usr/lib/python2.6/site-packages/pymol',
     'PYMOL_DATA':'/usr/share/pymol/data',
     'PYMOL_SCRIPTS':'/usr/share/pymol/scripts',
     })
+if 'DISPLAY' in os.environ:
+   env['ENV']['DISPLAY'] = os.environ['DISPLAY']
+
 asymptote.generate(env)
 gnuplot.generate(env)