[gthumb: 2/2] Merge branch 'tgurr/gthumb-meson-includedir' into HEAD



commit a0be7b3b5af266d475374f52dab7cd4d6d108225
Merge: 3ae1db24 887729e5
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Feb 24 08:45:12 2019 +0100

    Merge branch 'tgurr/gthumb-meson-includedir' into HEAD

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --cc meson.build
index 4953835a,6f1ead3f..41e1ebb6
--- a/meson.build
+++ b/meson.build
@@@ -32,8 -32,8 +32,8 @@@ c_comp = meson.get_compiler('c'
  prefix = get_option('prefix')
  datadir = join_paths(prefix, get_option('datadir'))
  pkgdatadir = join_paths(datadir, meson.project_name())
- pkgincludedir = join_paths(prefix, 'include', meson.project_name())
+ pkgincludedir = join_paths(prefix, get_option('includedir'), meson.project_name())
 -pkglibdir = join_paths(prefix, 'lib', meson.project_name())
 +pkglibdir = join_paths(prefix, get_option('libdir'), meson.project_name())
  po_dir = join_paths(meson.source_root(), 'po')
  extensions_install_dir = join_paths(pkglibdir, 'extensions')
  ui_install_dir = join_paths(pkgdatadir, 'ui')


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