[geany/geany-plugins] c04b27: [Debugger:WAF] Fixed unevaluated ${#vars} in defines dict.

[Vadim Kochan]

Branch:      refs/heads/master
Author:      Vadim Kochan <vadim4j at gmail.com>
Committer:   Vadim Kochan <vadim4j at gmail.com>
Date:        Fri, 25 Jan 2013 22:39:02 UTC
Commit:      c04b27087e35ef846762a372e700d77b61a79aa6
             https://github.com/geany/geany-plugins/commit/c04b27087e35ef846762a372e700d77b61a79aa6

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

Images were not loaded, b'couse of getting defined
DBGPLUG_DATA_DIR  "${PKGDATADIR}/debugger".

+ Fixed misspeling for "pludin_datadir"


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).