Browse Source

fix meson.build file (was installing webkit extension into wrong location...omg)

sisyphus
Dustin Falgout 8 years ago
parent
commit
9f858d8e8c
  1. 10
      src/meson.build

10
src/meson.build

@ -1,6 +1,7 @@
configure_file(output: 'config.h', configuration: conf) configure_file(output: 'config.h', configuration: conf)
gresource_sources = include_directories('gresource') gresource_sources = include_directories('gresource')
extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter')
# ======================================= # # ======================================= #
# ------->>> Webkit2 Extension <<<------- # # ------->>> Webkit2 Extension <<<------- #
@ -13,7 +14,9 @@ webext = shared_library(
webext_sources, webext_sources,
dependencies: webext_deps, dependencies: webext_deps,
include_directories : gresource_sources, 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'] greeter_sources = ['gresource/greeter-resources.c', 'greeter.c']
extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter')
greeter_cargs = [ greeter_cargs = [
'-DLIGHTDM_WEBKIT2_GREETER_EXTENSIONS_DIR=@0@'.format(extdir) '-DLIGHTDM_WEBKIT2_GREETER_EXTENSIONS_DIR=@0@'.format(extdir)
] ]
@ -34,7 +35,8 @@ greeter = executable(
dependencies: deps, dependencies: deps,
c_args: greeter_cargs, c_args: greeter_cargs,
include_directories : gresource_sources, include_directories : gresource_sources,
install: true) install: true
)
# ===================================== # # ===================================== #

Loading…
Cancel
Save