From: Sven Eden <yamakuzure@gmx.net>
Date: Sun, 10 Dec 2017 14:15:12 +0000 (+0100)
Subject: Fix and fortify cap-list generation and inlcude symlinking for gentoo build system.
X-Git-Tag: v235.1~28
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=e158518c16e6cd178e444fc0ced46038c3eac9bf;p=elogind.git

Fix and fortify cap-list generation and inlcude symlinking for gentoo build system.
---

diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
index 4019d7092..cdbf11c7a 100755
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -5,7 +5,7 @@
 #         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
 #         grep -v CAP_LAST_CAP
 #else
-$1 -dM -include linux/capability.h -I../src/shared -include "$2" -include "$3" - </dev/null | \
+$1 -dM -include linux/capability.h -I"$2"/src/shared -include "$3" -include "$4" - </dev/null | \
         awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
         grep -v CAP_LAST_CAP
 #endif // 0
diff --git a/src/basic/meson.build b/src/basic/meson.build
index fd7bbd781..6ea6dc4d7 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -364,7 +364,7 @@ generate_cap_list = find_program('generate-cap-list.sh')
 cap_list_txt = custom_target(
         'cap-list.txt',
         output : 'cap-list.txt',
-        command : [generate_cap_list, cpp, config_h, missing_h],
+        command : [generate_cap_list, cpp, meson.source_root(), config_h, missing_h],
         capture : true)
 
 generate_errno_list = find_program('generate-errno-list.sh')
diff --git a/tools/meson-symlink_headers.sh b/tools/meson-symlink_headers.sh
index e5ca647d1..32388d06f 100755
--- a/tools/meson-symlink_headers.sh
+++ b/tools/meson-symlink_headers.sh
@@ -4,6 +4,6 @@ INCDIR="$1"
 shift 1
 
 while [ $# -gt 0 ] ; do
-    ln -vfs "systemd/$1" "${INCDIR}/elogind/$1"
+    ln -vfs "systemd/$1" "${DESTDIR:-}/${INCDIR}/elogind/$1"
 	shift 1
 done