[geany/geany-plugins] c9f7f4: Add the installation prefix only to installed files

[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:        Fri, 11 Apr 2014 18:15:37 UTC
Commit:      c9f7f448db510dbaa58bed185121fd2d4400b040
             https://github.com/geany/geany-plugins/commit/c9f7f448db510dbaa58bed185121fd2d4400b040

Log Message:
-----------
Add the installation prefix only to installed files

But not to the paths compiled into the plugin. This
fixes broken resource loading.


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

Modified: scope/wscript_build
14 files changed, 10 insertions(+), 4 deletions(-)
===================================================================
@@ -28,18 +28,24 @@ name = 'Scope'
 includes = ['scope/src', 'scope/src/store']
 
 if target_is_win32(bld):
-	datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}/geany-plugins/scope'
+	datadir_define = '${GEANYPLUGINS_DATADIR}/geany-plugins/scope'
+	datadir = '${G_PREFIX}/%s' % datadir_define
 	docdir = 'doc/plugins/scope'
-	htmldocdir = '${G_PREFIX}/%s/html' % docdir
+	htmldocdir_define = '%s/html' % docdir
+	htmldocdir = '${G_PREFIX}/%s' % htmldocdir_define
 	libraries = []
 else:
 	datadir = '${GEANYPLUGINS_DATADIR}/geany-plugins/scope'
+	datadir_define = datadir
 	docdir = '${DOCDIR}/scope'
 	htmldocdir = '%s/html' % docdir
+	htmldocdir_define = htmldocdir
 	libraries = ['VTE', 'UTIL']
 
-defines = [ subst_vars('PLUGINDATADIR="' + datadir + '"', bld.env).replace("\\", "/"),
-	subst_vars('PLUGINHTMLDOCDIR="' + htmldocdir + '"', bld.env).replace("\\", "/")]
+defines = [
+	subst_vars('PLUGINDATADIR="' + datadir_define + '"', bld.env).replace("\\", "/"),
+	subst_vars('PLUGINHTMLDOCDIR="' + htmldocdir_define + '"', bld.env).replace("\\", "/")
+]
 
 build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines)
 



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