From f0497e72316f0109ac258472af998b971b5e6d27 Mon Sep 17 00:00:00 2001
From: amibranch <147333645+amibranch@users.noreply.github.com>
Date: Wed, 21 Aug 2024 15:30:55 +0000
Subject: [PATCH] meson: fix generated header paths

---
 meson.build              | 4 ++--
 misc-utils/Makemodule.am | 4 ++--
 tools/all_errnos         | 3 ++-
 tools/all_syscalls       | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index d98a3a0dcb3..83bdf788382 100644
--- a/meson.build
+++ b/meson.build
@@ -2890,7 +2890,7 @@ endif
 errnos_h = custom_target('errnos.h',
   input : 'tools/all_errnos',
   output : 'errnos.h',
-  command : ['tools/all_errnos', sed.full_path(),
+  command : ['tools/all_errnos', sed.full_path(), '@OUTPUT@',
              cc.cmd_array(), get_option('c_args')],
 )
 
@@ -3222,7 +3222,7 @@ endif
 syscalls_h = custom_target('syscalls.h',
   input : 'tools/all_syscalls',
   output : 'syscalls.h',
-  command : ['tools/all_syscalls', sed.full_path(),
+  command : ['tools/all_syscalls', sed.full_path(), '@OUTPUT@',
              cc.cmd_array(), get_option('c_args')],
 )
 
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index b99f978e77c..7a17d7689f4 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -1,6 +1,6 @@
 errnos.h: $(top_srcdir)/tools/all_errnos
 	@echo '  GEN      $@'
-	@$(top_srcdir)/tools/all_errnos "$(SED)" $(CC) $(CFLAGS)
+	@$(top_srcdir)/tools/all_errnos "$(SED)" "$@" $(CC) $(CFLAGS)
 
 -include errnos.h.deps
 CLEANFILES += errnos.h errnos.h.deps
@@ -314,7 +314,7 @@ misc-utils/enosys.c: syscalls.h errnos.h
 
 syscalls.h: $(top_srcdir)/tools/all_syscalls
 	@echo '  GEN      $@'
-	@$(top_srcdir)/tools/all_syscalls "$(SED)" $(CC) $(CFLAGS)
+	@$(top_srcdir)/tools/all_syscalls "$(SED)" "$@" $(CC) $(CFLAGS)
 
 -include syscalls.h.deps
 CLEANFILES += syscalls.h syscalls.h.deps
diff --git a/tools/all_errnos b/tools/all_errnos
index 36dee1c5479..de4fbf0b39f 100755
--- a/tools/all_errnos
+++ b/tools/all_errnos
@@ -7,7 +7,8 @@ set -o pipefail
 
 SED="$1"
 shift
-OUTPUT=errnos.h
+OUTPUT="$1"
+shift
 ERRNO_INCLUDES="
 #include <sys/errno.h>
 "
diff --git a/tools/all_syscalls b/tools/all_syscalls
index eccb0d0555d..d1a84e025b4 100755
--- a/tools/all_syscalls
+++ b/tools/all_syscalls
@@ -5,7 +5,8 @@ set -o pipefail
 
 SED="$1"
 shift
-OUTPUT=syscalls.h
+OUTPUT="$1"
+shift
 SYSCALL_INCLUDES="
 #include <sys/syscall.h>
 "