[geany/geany] 01cf9a: Do not use backward slashes in geany.pc on Windows

[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:        Thu, 29 May 2014 15:47:37 UTC
Commit:      01cf9a9fdc6795b971cbad59585d33bfcb796b74
             https://github.com/geany/geany/commit/01cf9a9fdc6795b971cbad59585d33bfcb796b74

Log Message:
-----------
Do not use backward slashes in geany.pc on Windows

And explicitly convert backward slashes in the global
prefix to forward slashes as tools like pkg-config or
gcc could interpret the backward slashes as escape
sequences.


Modified Paths:
--------------
    wscript

Modified: wscript
16 lines changed, 11 insertions(+), 5 deletions(-)
===================================================================
@@ -457,6 +457,12 @@ def build(bld):
             appname         = 'geany')
 
     # geany.pc
+    if is_win32:
+        # replace backward slashes by forward slashes as they could be interepreted as escape
+        # characters
+        geany_pc_prefix = bld.env['PREFIX'].replace('\\', '/')
+    else:
+        geany_pc_prefix = bld.env['PREFIX']
     bld(
         source          = 'geany.pc.in',
         dct             = {'VERSION': VERSION,
@@ -464,13 +470,13 @@ def build(bld):
                                 (bld.env['gtk_package_name'],
                                  bld.env['minimum_gtk_version'],
                                  MINIMUM_GLIB_VERSION),
-                           'prefix': bld.env['PREFIX'],
+                           'prefix': geany_pc_prefix,
                            'exec_prefix': '${prefix}',
-                           'libdir': os.path.join('${exec_prefix}', 'lib'),
-                           'includedir': os.path.join('${prefix}', 'include'),
-                           'datarootdir': os.path.join('${prefix}', 'share'),
+                           'libdir': '${exec_prefix}/lib',
+                           'includedir': '${prefix}/include',
+                           'datarootdir': '${prefix}/share',
                            'datadir': '${datarootdir}',
-                           'localedir': os.path.join('${datarootdir}', 'locale')})
+                           'localedir': '${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).