[gtk/gtk-3-24: 1/2] build: clean up .pc generation




commit 24f9cc76c02a708bc3b872f123edf90c7cd8c261
Author: Jan Tojnar <jtojnar gmail com>
Date:   Wed Apr 29 07:42:38 2020 +0200

    build: clean up .pc generation
    
    Path concatenation is much nicer than the unwieldy format method.
    Since paths returned by get_option are relative to prefix, they will be joined as before.
    
    As a bonus, this fixes weird platforms like NixOS that actually pass absolute includedir under a 
different prefix.

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index a8f1383a0c..a3a7545ae1 100644
--- a/meson.build
+++ b/meson.build
@@ -868,8 +868,8 @@ pkgconf = configuration_data()
 
 pkgconf.set('prefix', get_option('prefix'))
 pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', '${prefix}' / get_option('libdir'))
+pkgconf.set('includedir', '${prefix}' / get_option('includedir'))
 pkgconf.set('GTK_API_VERSION', gtk_api_version)
 pkgconf.set('VERSION', meson.project_version())
 pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version)


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