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

Merge pull request #806 from DanySpin97/master 

Install include directory into includedir
This commit is contained in:
emersion 2018-04-03 11:02:13 -04:00 committed by GitHub
parent 506acbdecd f83ad3f3ef
commit c44bb8096e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wlr/meson.build
View File

@ -9,5 +9,6 @@ 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])
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data)
wlr_inc_dest = join_paths(get_option('includedir'), 'wlr')
configure_file(output: 'config.h', install_dir: wlr_inc_dest, configuration: conf_data)
configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data)

4
meson.build
View File

@ -125,8 +125,10 @@ if get_option('enable-xwayland')
else
exclude_headers += 'xwayland.h'
endif
includedir = get_option('includedir')
exclude_headers += 'meson.build'
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)
install_subdir('include/wlr', install_dir: includedir, exclude_files: exclude_headers)
subdir('include')