aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
authorBjörn Esser <besser82@fedoraproject.org>2017-12-27 14:37:55 +0100
committerBjörn Esser <besser82@fedoraproject.org>2017-12-27 17:13:58 +0100
commitff1384962449f4a2a1a6b2eada5582bdc2c61bd5 (patch)
tree89513769949d2a4afda41de69cd0de8e6fbfd042 /include/wlr
parenta0d2a6b445f33b608019809f581a80d28062178d (diff)
downloadwlroots-ff1384962449f4a2a1a6b2eada5582bdc2c61bd5.tar.xz
config: Avoid clash with other config-headers
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/meson.build1
-rw-r--r--include/wlr/xwayland.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
new file mode 100644
index 00000000..508abfe7
--- /dev/null
+++ b/include/wlr/meson.build
@@ -0,0 +1 @@
+configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 37b09204..8d71a7ab 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -3,7 +3,7 @@
#include <time.h>
#include <stdbool.h>
-#include "config.h"
+#include <wlr/config.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_seat.h>
#include <xcb/xcb.h>