[libdazzle: 1/2] Fix bindir expanding to libexecdir when not building libdazzle as a subproject



commit 385c7feea23ba8f966afdf4cbbee196a6a0d691e
Author: Luciano Santos <luc14n0 linuxmail org>
Date:   Fri Aug 17 03:47:22 2018 +0000

    Fix bindir expanding to libexecdir when not building libdazzle as a subproject

 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8cd9e9a..6b42bd7 100644
--- a/meson.build
+++ b/meson.build
@@ -134,11 +134,11 @@ libdir = join_paths(get_option('libdir'), package_subdir)
 girdir = join_paths(get_option('datadir'), package_subdir, 'gir-1.0')
 typelibdir = join_paths(get_option('libdir'), package_subdir, 'girepository-1.0')
 if package_subdir != ''
-  bindir = get_option('bindir')
-  vapidir = join_paths(get_option('datadir'), package_subdir, 'vapi')
-else
   # Use libexecdir to avoid subdirectories under bindir
   bindir = join_paths(get_option('libexecdir'), package_subdir)
+  vapidir = join_paths(get_option('datadir'), package_subdir, 'vapi')
+else
+  bindir = get_option('bindir')
   vapidir = join_paths(get_option('datadir'), 'vala', 'vapi')
 endif
 


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