public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to absolute path for includedir/libdir

Browse Source
This commit is contained in:
Bastian Köcher
2018-04-04 17:25:39 +02:00
parent 3508f3058d
commit 40b4b87cc4
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index b3bf0d4d4..fb4386cfc 100644
index b3bf0d4d4..3e6e576c0 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index b3bf0d4d4..fb4386cfc 100644
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', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)