From 9f858d8e8c3710492b85318bfc1ea0eb5121b543 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Fri, 30 Sep 2016 18:40:15 -0500 Subject: [PATCH] fix meson.build file (was installing webkit extension into wrong location...omg) --- src/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index a890747..b398735 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,7 @@ configure_file(output: 'config.h', configuration: conf) gresource_sources = include_directories('gresource') +extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter') # ======================================= # # ------->>> Webkit2 Extension <<<------- # @@ -13,7 +14,9 @@ webext = shared_library( webext_sources, dependencies: webext_deps, include_directories : gresource_sources, - install: true) + install: true, + install_dir : extdir +) # ============================= # @@ -22,8 +25,6 @@ webext = shared_library( greeter_sources = ['gresource/greeter-resources.c', 'greeter.c'] -extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter') - greeter_cargs = [ '-DLIGHTDM_WEBKIT2_GREETER_EXTENSIONS_DIR=@0@'.format(extdir) ] @@ -34,7 +35,8 @@ greeter = executable( dependencies: deps, c_args: greeter_cargs, include_directories : gresource_sources, - install: true) + install: true +) # ===================================== #