Merge branch 'mr-origin-2' into develop

meson.build

@@ -13,6 +13,11 @@ prefix = get_option('prefix')
 datadir = get_option('datadir')
 metainfodir = join_paths(datadir, 'metainfo')
 desktopdir = join_paths(datadir, 'applications')
+if get_option('plugindir') == ''
+  plugindir = zathura.get_pkgconfig_variable('plugindir')
+else
+  plugindir = get_option('plugindir')
+endif
 
 # required dependencies
 zathura = dependency('zathura', version: '>=0.3.9')
@@ -62,7 +67,7 @@ pdf = shared_module('pdf-poppler',
   dependencies: build_dependencies,
   c_args: defines + flags,
   install: true,
-  install_dir: zathura.get_pkgconfig_variable('plugindir')
+  install_dir: plugindir
 )
 
 subdir('data')

meson_options.txt

+option('plugindir',
+       type: 'string', value: '',
+       description: 'Install to a different location than Zathuras plugin directory')