Permalink
Browse files

Do not hardcode LIBDIR when building on Windows

  • Loading branch information...
eht16 committed Apr 20, 2014
1 parent 3325a0d commit 87f4b402965a079da1c1b2aac793c517a221518e
Showing with 4 additions and 4 deletions.
  1. +1 −1 build/wafutils.py
  2. +1 −1 geanylua/wscript_build
  3. +1 −1 multiterm/wscript_build
  4. +1 −1 wscript
View
@@ -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
View
@@ -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'
View
@@ -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,
View
@@ -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)

0 comments on commit 87f4b40

Please sign in to comment.