Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 20 Apr 2014 15:39:53 UTC Commit: 87f4b402965a079da1c1b2aac793c517a221518e https://github.com/geany/geany-plugins/commit/87f4b402965a079da1c1b2aac793c5...

Log Message: ----------- Do not hardcode LIBDIR when building on Windows

Modified Paths: -------------- build/wafutils.py geanylua/wscript_build multiterm/wscript_build wscript

Modified: build/wafutils.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -121,7 +121,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries defines = defines, target = plugin_name, use = libraries, - install_path = '${G_PREFIX}/lib' if is_win32 else '${LIBDIR}/geany/') + install_path = '${G_PREFIX}/${LIBDIR}' if is_win32 else '${LIBDIR}/geany/')

install_docs(ctx, plugin_name, 'AUTHORS ChangeLog COPYING NEWS README THANKS TODO'.split()) return task

Modified: geanylua/wscript_build 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,7 @@ build_plugin(bld, name, sources=sources, libraries=libraries)

is_win32 = target_is_win32(bld) if is_win32: - install_path = '${G_PREFIX}/lib/geany-plugins/geanylua' + install_path = '${G_PREFIX}/${LIBDIR}/geany-plugins/geanylua' else: install_path = '${LIBDIR}/geany-plugins/geanylua'

Modified: multiterm/wscript_build 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,7 @@ def build_vala_plugin(ctx, name, sources, vapi_dirs=None, packages=None, libraries.extend(['GTK', 'GEANY']) features.extend(['c', 'cshlib'])

- install_path = '${G_PREFIX}/lib' if target_is_win32(ctx) else '${LIBDIR}/geany/' + install_path = '${G_PREFIX}/${LIBDIR}' if target_is_win32(ctx) else '${LIBDIR}/geany/'

task = ctx.shlib(packages = packages, features = features,

Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -151,7 +151,7 @@ def setup_configuration_env(conf): conf.env['G_PREFIX'] = conf.env['PREFIX'] # paths add_to_env_and_define(conf, 'PREFIX', '', quote=True) - add_to_env_and_define(conf, 'LIBDIR', '', quote=True) + add_to_env_and_define(conf, 'LIBDIR', 'lib', quote=True) add_to_env_and_define(conf, 'LIBEXECDIR', '', quote=True) add_to_env_and_define(conf, 'DOCDIR', 'doc', quote=True) conf.define('LOCALEDIR', 'share/locale', 1)

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