[gobject-introspection/wip/meson: 3/23] meson: Use ${prefix} in pkg-config files



commit a7d15a94f25fc008214692e5b3724ed0a8dd595e
Author: Nirbheek Chauhan <nirbheek centricular com>
Date:   Tue Nov 21 21:20:37 2017 +0530

    meson: Use ${prefix} in pkg-config files
    
    This allows the pkg-config files to be relocated at on Windows by
    moving the entire prefix and pkg-config will automatically set the
    value of prefix.

 meson.build |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index bf76da4..0c5d8f3 100644
--- a/meson.build
+++ b/meson.build
@@ -74,11 +74,11 @@ prefix = get_option('prefix')
 pkgconfig_conf = configuration_data()
 pkgconfig_conf.set('prefix', prefix)
 pkgconfig_conf.set('exec_prefix', '${prefix}')
-pkgconfig_conf.set('bindir', join_paths(prefix, get_option('bindir')))
-pkgconfig_conf.set('libdir', join_paths(prefix, get_option('libdir')))
-pkgconfig_conf.set('datarootdir', join_paths(prefix, get_option('datadir')))
+pkgconfig_conf.set('bindir', join_paths('${prefix}', get_option('bindir')))
+pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir')))
+pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
 pkgconfig_conf.set('datadir', '${datarootdir}')
-pkgconfig_conf.set('includedir', join_paths(prefix, get_option('includedir')))
+pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
 if host_system == 'windows' or host_system == 'cygwin'
   pkgconfig_conf.set('EXEEXT', '.exe')
 else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]