[WIP] Attempt to add /usr/local search paths #199
25
meson.build
25
meson.build
|
@ -24,7 +24,8 @@ endforeach
|
||||||
|
|
||||||
default_path = []
|
default_path = []
|
||||||
foreach f : ['libdir', 'datadir']
|
foreach f : ['libdir', 'datadir']
|
||||||
default_path += [join_paths(get_option('prefix'), get_option(f), 'pkgconfig')]
|
default_path += [join_paths('/usr/local', get_option(f), 'pkgconfig')]
|
||||||
|
default_path += [join_paths('/usr', get_option(f), 'pkgconfig')]
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
personality_path = []
|
personality_path = []
|
||||||
|
@ -34,7 +35,29 @@ endforeach
|
||||||
|
|
||||||
cdata.set_quoted('SYSTEM_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
|
cdata.set_quoted('SYSTEM_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
|
||||||
cdata.set_quoted('SYSTEM_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir')))
|
cdata.set_quoted('SYSTEM_INCLUDEDIR', join_paths(get_option('prefix'), get_option('includedir')))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# FIXME: Dunno why this still doesn't work, despite now containing all the right paths.
|
||||||
cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path))
|
cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path))
|
||||||
|
assert(false, ':'.join(default_path))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
|
cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
|
||||||
cdata.set_quoted('PACKAGE_NAME', meson.project_name())
|
cdata.set_quoted('PACKAGE_NAME', meson.project_name())
|
||||||
cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
|
cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
|
||||||
|
|
Loading…
Reference in New Issue