Merge branch 'fix_generated_header_paths' of https://github.com/amibr…

…anch/util-linux

* 'fix_generated_header_paths' of https://github.com/amibranch/util-linux:
  meson: fix generated header paths

meson.build

@@ -2891,7 +2891,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')],
 )
 
@@ -3223,7 +3223,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')],
 )
 

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

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>
 "

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>
 "