[geany/geany-plugins] 7294a4: Merge pull request #79 from vkochan/debugger_waf_defines_fix

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Thu, 31 Jan 2013 18:13:53 UTC
Commit:      7294a45489464db3adf62f18f84357a34b452940
             https://github.com/geany/geany-plugins/commit/7294a45489464db3adf62f18f84357a34b452940

Log Message:
-----------
Merge pull request #79 from vkochan/debugger_waf_defines_fix

[Debugger:WAF] Fixed unevaluated ${#vars} in defines dict.


Modified Paths:
--------------
    debugger/wscript_build

Modified: debugger/wscript_build
9 files changed, 5 insertions(+), 4 deletions(-)
===================================================================
@@ -21,6 +21,7 @@
 # $Id: wscript_build 1735 2010-11-09 17:03:40Z eht16 $
 
 from build.wafutils import build_plugin
+from waflib.Utils import subst_vars
 
 name = 'Debugger'
 
@@ -29,13 +30,13 @@ includes = ['debugger/src', 'debugger/src/cell_renderers',
 
 libraries = ['VTE', 'UTIL']
 
-pludin_datadir = '${PKGDATADIR}/debugger'
+plugin_datadir = '${PKGDATADIR}/debugger'
 
-defines=[ 'DBGPLUG_DATA_DIR="' + pludin_datadir + '"']
+defines=[ subst_vars('DBGPLUG_DATA_DIR="' + plugin_datadir + '"', bld.env) ]
 
 build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines)
 
 # Icons
 start_dir = bld.path.find_dir('img')
-bld.install_files(pludin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir)
-bld.install_files(pludin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir)
+bld.install_files(plugin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir)
+bld.install_files(plugin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).