From 733ede64464480388be729f3edc3d8081876894e Mon Sep 17 00:00:00 2001
From: Alexander van der Grinten <alexander.vandergrinten@gmail.com>
Date: Sat, 15 Feb 2020 18:47:24 +0100
Subject: [PATCH] options/elf: Move elf.h here

---
 meson.build                          | 2 ++
 options/{linux => elf}/include/elf.h | 0
 options/elf/meson.build              | 6 +++++-
 options/linux/meson.build            | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename options/{linux => elf}/include/elf.h (100%)

diff --git a/meson.build b/meson.build
index cac9d649..03748fa6 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,9 @@ if not disable_posix_option
 	libc_include_dirs += include_directories('options/posix/include')
 endif
 
+rtdl_include_dirs += include_directories('options/elf/include')
 rtdl_include_dirs += include_directories('options/linux/include')
+libc_include_dirs += include_directories('options/elf/include')
 libc_include_dirs += include_directories('options/linux/include')
 
 #----------------------------------------------------------------------------------------
diff --git a/options/linux/include/elf.h b/options/elf/include/elf.h
similarity index 100%
rename from options/linux/include/elf.h
rename to options/elf/include/elf.h
diff --git a/options/elf/meson.build b/options/elf/meson.build
index fd57c4bb..bfc3adbd 100644
--- a/options/elf/meson.build
+++ b/options/elf/meson.build
@@ -1,5 +1,9 @@
-
 libc_sources += files(
 	'generic/startup.cpp',
 )
 
+if not no_headers
+	install_headers(
+		'include/elf.h',
+	)
+endif
diff --git a/options/linux/meson.build b/options/linux/meson.build
index 0b8397b6..e06d9896 100644
--- a/options/linux/meson.build
+++ b/options/linux/meson.build
@@ -20,7 +20,6 @@ libc_sources += files(
 
 if not no_headers
 	install_headers(
-		'include/elf.h',
 		'include/malloc.h',
 		'include/memory.h',
 		'include/mntent.h',