meson: fix generated header paths

diff --git a/meson.build b/meson.build
index d98a3a0dcb3c91a469d27b695b7534088b46e896..83bdf788382d1d1612c3390564c77401fc5ff4f6 100644 (file)
--- 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 b99f978e77c7bb61bf5e5d7f90384143cf259c4c..7a17d7689f4ffdae49c6482eadeb3cdfc2042019 100644 (file)
--- 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 36dee1c54795399ab051dc16533bd9fd8dfdd939..de4fbf0b39f287668091d880884e77de9f294cfd 100755 (executable)
--- 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 eccb0d0555d15bf0a6772891cb3b921fc79cfa9e..d1a84e025b457d79125bb2a3a167099ead96279e 100755 (executable)
--- 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>
 "