[gobject-introspection/fix-source-pos-root-fallback: 1/2] meson: set libdir/bindir relative to exec_prefix



commit 15a9fc823a61f9a4c78835ad3ab46a1df5241e84
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Jan 6 13:07:42 2019 +0100

    meson: set libdir/bindir relative to exec_prefix
    
    To match what autotools produces

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index cd647b04..f661c6f6 100644
--- a/meson.build
+++ b/meson.build
@@ -175,8 +175,8 @@ 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('bindir', join_paths('${exec_prefix}', get_option('bindir')))
+pkgconfig_conf.set('libdir', join_paths('${exec_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')))


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