summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-05-23 07:44:24 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-05-23 07:44:24 +0200
commitbeb8b0dad71871aa66b63901b3e6b6c047e1a646 (patch)
treef96b49e7dabca98306db6cf716592c62adcc9b77 /meson.build
parent2861a48339aa0756131008dfaf399426c97de34b (diff)
parent08f04632f65e109dae9bd554621e33454adacf41 (diff)
Merge branch 'release/debian/0.30.16-1'debian/0.30.16-1
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index a5f9061..acbe821 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('shotwell', ['vala', 'c'],
- version : '0.30.15',
+ version : '0.30.16',
meson_version : '>= 0.43.0',
default_options : ['buildtype=debugoptimized'])
@@ -12,7 +12,7 @@ conf.set('_VERSION', '"@0@"'.format(meson.project_version()))
conf.set('_PREFIX', '"@0@"'.format(get_option('prefix')))
conf.set('_LANG_SUPPORT_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('localedir'))))
conf.set('_LIBEXECDIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libexecdir'))))
-conf.set('_LIB', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libdir'))))
+conf.set('_LIB', '"@0@"'.format(get_option('libdir')))
configure_file(output : 'config.h', configuration: conf)
config_incdir = include_directories('.')
@@ -96,7 +96,7 @@ if get_option('udev') and gudev.found()
endif
if get_option('face-detection')
- add_global_arguments(['--define=ENABLE_FACES'], language : 'vala')
+ add_global_arguments(['--define=ENABLE_FACE_DETECTION'], language : 'vala')
subdir('facedetect')
endif