blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further fixes to header install dir

This commit is contained in:
Drew DeVault 2017-12-28 14:38:52 -05:00
parent 45a21ca232
commit c23bd2ab7a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wlr/meson.build
View File

@ -9,6 +9,5 @@ version_data.set('WLR_VERSION_API_CURRENT', so_version[0])
version_data.set('WLR_VERSION_API_REVISION', so_version[1])
version_data.set('WLR_VERSION_API_AGE', so_version[2])
header_install_dir = 'include/@0@/wlr'.format(meson.project_name())
configure_file(output: 'config.h', install_dir: header_install_dir, configuration: conf_data)
configure_file(output: 'version.h', install_dir: header_install_dir, configuration: version_data)
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data)

3
meson.build
View File

@ -97,8 +97,7 @@ else
exclude_headers += 'xwm.h'
endif
exclude_headers += 'meson.build'
header_install_dir = 'include/@0@'.format('wlr')
install_subdir('include/wlr', install_dir: header_install_dir, exclude_files: exclude_headers)
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)
subdir('include')