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 4019d7092b57ada1a83df3bc3c991c91a7ba0dff..cdbf11c7ad2033cdf04998f4e75e0a7a840b4086 100755 (executable)
--- 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 fd7bbd78128ad407b9e9064f4f621cd3fdcf5319..6ea6dc4d7a52c2d795dc6d3503d247f655c2e57f 100644 (file)
--- 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 e5ca647d14cdf627dbada697029bb0fd742ad00c..32388d06f9260121b23a730983e836d26f27554a 100755 (executable)
--- 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