ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

[WIP] Attempt to add /usr/local search paths #199

Closed
anordal wants to merge 1 commits from opensuse-1175039 into master
pull from: opensuse-1175039
merge into: ariadne:master
Conversation 19 Commits 1 Files Changed 1
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meson.build
View File

@ -24,7 +24,8 @@ endforeach
default_path = []
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
personality_path = []
@ -34,7 +35,29 @@ endforeach
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')))
# FIXME: Dunno why this still doesn't work, despite now containing all the right paths.
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('PACKAGE_NAME', meson.project_name())
cdata.set_quoted('PACKAGE_VERSION', meson.project_version())