diff options
| author | Russel Winder <russel@winder.org.uk> | 2012-10-07 12:53:59 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2012-10-07 12:53:59 (GMT) |
| commit | a3b029fc95f3d3a4ad6f891981d7d587875d0a1d (patch) | |
| tree | 9f53c187a70720519f6479d544f73bab6222b583 /src/engine/SCons/Tool | |
| parent | 1f035386be2924e356d385e813703b761f3dd43b (diff) | |
| parent | 46043901f7a93385e5bb2d3243073bd6c5634ca8 (diff) | |
| download | SCons-a3b029fc95f3d3a4ad6f891981d7d587875d0a1d.zip SCons-a3b029fc95f3d3a4ad6f891981d7d587875d0a1d.tar.gz SCons-a3b029fc95f3d3a4ad6f891981d7d587875d0a1d.tar.bz2 | |
Merge in default/tip from the mainline.
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/xgettext.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/xgettext.py b/src/engine/SCons/Tool/xgettext.py index 17e055f..64436b8 100644 --- a/src/engine/SCons/Tool/xgettext.py +++ b/src/engine/SCons/Tool/xgettext.py @@ -271,7 +271,10 @@ def generate(env,**kw): import SCons.Util from SCons.Tool.GettextCommon import RPaths, _detect_xgettext - env['XGETTEXT'] = _detect_xgettext(env) + try: + env['XGETTEXT'] = _detect_xgettext(env) + except: + env['XGETTEXT'] = 'xgettext' # NOTE: sources="$SOURCES" would work as well. However, we use following # construction to convert absolute paths provided by scons onto paths # relative to current working dir. Note, that scons expands $SOURCE(S) to |