[geany/geany-plugins] 48cc09: scope - fixed the path handling when building with Waf

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Thu, 07 Mar 2013 20:15:45 UTC
Commit:      48cc09098d3587e430b6705fb090054e03316c64
             https://github.com/geany/geany-plugins/commit/48cc09098d3587e430b6705fb090054e03316c64

Log Message:
-----------
scope - fixed the path handling when building with Waf


Modified Paths:
--------------
    scope/ChangeLog
    scope/wscript_build

Modified: scope/ChangeLog
12 files changed, 12 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,15 @@
+2013-03-07  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * wscript_build
+   Fixed the path handling when building with Waf.
+
+
+2013-03-07  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
+
+ * src/gtk216.c:
+   Fixed a bug in array size emulation
+
+
 2013-02-21  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
 
  * docs/scope.html:


Modified: scope/wscript_build
20 files changed, 12 insertions(+), 8 deletions(-)
===================================================================
@@ -21,28 +21,32 @@
 # $Id$
 
 from build.wafutils import build_plugin, target_is_win32
+from waflib.Utils import subst_vars
 
 
 name = 'Scope'
 includes = ['scope/src']
 
 if target_is_win32(bld):
-	datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}'
-	docdir = '${G_PREFIX}/doc/plugins/scope'
+	datadir = '${GEANYPLUGINS_DATADIR}/geany-plugins/scope'
+	docdir = 'doc/plugins/scope'
+	prefix = '${G_PREFIX}/'
 	libraries = []
 else:
-	datadir = '${GEANYPLUGINS_DATADIR}'
+	datadir = '${GEANYPLUGINS_DATADIR}/geany-plugins/scope'
 	docdir = '${DOCDIR}/scope'
+	prefix = ''
 	libraries = ['VTE', 'UTIL']
 
 htmldocdir = '%s/html' % docdir
-defines = [ 'PLUGINDATADIR="' + datadir + '"', 'PLUGINHTMLDOCDIR="' + htmldocdir + '"']
+defines = [ subst_vars('PLUGINDATADIR="' + datadir + '"', bld.env),
+			subst_vars('PLUGINHTMLDOCDIR="' + htmldocdir + '"', bld.env)]
 
 build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines)
 
-bld.install_files(htmldocdir, 'docs/codes.html')
-bld.install_files(htmldocdir, 'docs/scope.html')
+bld.install_files('%s%s' % (prefix, htmldocdir), 'docs/codes.html')
+bld.install_files('%s%s' % (prefix, htmldocdir), 'docs/scope.html')
 
 start_dir = bld.path.find_dir('data')
-bld.install_files(datadir, start_dir.ant_glob('*.png'), cwd=start_dir)
-bld.install_files(datadir, 'data/scope.glade')
+bld.install_files('%s%s' % (prefix, datadir), start_dir.ant_glob('*.png'), cwd=start_dir)
+bld.install_files('%s%s' % (prefix, datadir), 'data/scope.glade')



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