Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sat, 24 May 2014 09:32:45 UTC Commit: 1bacf869e076ef37caa768196d21d941a657d1e7 https://github.com/geany/geany/commit/1bacf869e076ef37caa768196d21d941a657d1...
Log Message: ----------- Extend use of os.path.join() to construct platform compliant paths
Modified Paths: -------------- wscript
Modified: wscript 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -52,7 +52,7 @@ from waflib.Tools.compiler_cxx import cxx_compiler
APPNAME = 'geany' VERSION = '1.25' -LINGUAS_FILE = 'po/LINGUAS' +LINGUAS_FILE = os.path.join('po', 'LINGUAS') MINIMUM_GTK_VERSION = '2.16.0' MINIMUM_GTK3_VERSION = '3.0.0' MINIMUM_GLIB_VERSION = '2.20.0' @@ -243,7 +243,7 @@ def configure(conf): _add_to_env_and_define(conf, 'LIBDIR', '%s/lib' % conf.env['PREFIX'], quote=True) conf.define('LOCALEDIR', os.path.join('share' 'locale'), quote=True) # overwrite LOCALEDIR to install message catalogues properly - conf.env['LOCALEDIR'] = os.path.join(conf.env['PREFIX'], 'share/locale') + conf.env['LOCALEDIR'] = os.path.join(conf.env['PREFIX'], 'share', 'locale') # DATADIR is defined in objidl.h, so we remove it from config.h but keep it in env conf.undefine('DATADIR') conf.env['DATADIR'] = os.path.join(conf.env['PREFIX'], 'data') @@ -466,11 +466,11 @@ def build(bld): MINIMUM_GLIB_VERSION), 'prefix': bld.env['PREFIX'], 'exec_prefix': '${prefix}', - 'libdir': '${exec_prefix}/lib', - 'includedir': '${prefix}/include', - 'datarootdir': '${prefix}/share', + 'libdir': os.path.join('${exec_prefix}', 'lib'), + 'includedir': os.path.join('${prefix}', 'include'), + 'datarootdir': os.path.join('${prefix}', 'share'), 'datadir': '${datarootdir}', - 'localedir': '${datarootdir}/locale'}) + 'localedir': os.path.join('${datarootdir}', 'locale')})
if not is_win32: # geany.desktop
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).