[geany/geany-plugins] e260ee: Use slashes as directory separator also on Windows

Enrico Tröger git-noreply at xxxxx
Mon Mar 4 21:58:18 UTC 2013

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Mon, 04 Mar 2013 21:58:18 UTC
Commit:      e260eefe6850c5ee237feca95906bb8cdf8d6eee

Log Message:
Use slashes as directory separator also on Windows

Backslashes would be more correct but lead to problems as interpreted as
escape sequences in the generated config.h and would require even more
hacking to get them properly quoted.
Fortunately, Windows accepts slashes as well.

Modified Paths:

Modified: wscript
6 files changed, 3 insertions(+), 3 deletions(-)
@@ -174,9 +174,9 @@ def setup_configuration_env(conf):
         add_to_env_and_define(conf, 'GEANYPLUGINS_DATADIR', conf.env['DATADIR'], quote=True)
         conf.env['GEANYPLUGINS_DATADIR'] = conf.env['DATADIR']
     # common
-    pkgdatadir = os.path.join(conf.env['GEANYPLUGINS_DATADIR'], 'geany-plugins')
-    pkglibdir = os.path.join(conf.env['LIBDIR'], 'geany-plugins')
-    pkgincludedir = os.path.join(conf.env['G_PREFIX'], 'include')
+    pkgdatadir = '%s/%s' % (conf.env['GEANYPLUGINS_DATADIR'], 'geany-plugins')
+    pkglibdir = '%s/%s' % (conf.env['LIBDIR'], 'geany-plugins')
+    pkgincludedir = '%s/%s' % (conf.env['G_PREFIX'], 'include')
     add_to_env_and_define(conf, 'INCLUDEDIR', pkgincludedir, quote=True)
     add_to_env_and_define(conf, 'DATAROOTDIR', conf.env['GEANYPLUGINS_DATADIR'], quote=True)
     add_to_env_and_define(conf, 'PKGDATADIR', pkgdatadir, quote=True)

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

More information about the Plugins-Commits mailing list