diff --git a/src/bin/psql/gen_tabcomplete.pl b/src/bin/psql/gen_tabcomplete.pl index 9e4c977cc57..41ba7bbdd61 100644 --- a/src/bin/psql/gen_tabcomplete.pl +++ b/src/bin/psql/gen_tabcomplete.pl @@ -55,8 +55,9 @@ my $outfile = ''; GetOptions('outfile=s' => \$outfile) or die "$0: wrong arguments"; -open my $infh, '<', $ARGV[0] - or die "$0: could not open input file '$ARGV[0]': $!\n"; +my $infile = $ARGV[0]; +open my $infh, '<', $infile + or die "$0: could not open input file '$infile': $!\n"; my $outfh; if ($outfile) @@ -91,7 +92,7 @@ printf $outfh <) @@ -245,7 +246,7 @@ sub process_else_if process_match($typ, $cs, $args, $else_if_lineno, $isfirst); $isfirst = 0; # approximate line positioning of AND'd condition - $output_code .= "#line ${end_lineno} \"tab-complete.in.c\"\n"; + $output_code .= "#line ${end_lineno} \"${infile}\"\n"; $output_code .= "\tif ($else_if_line\n"; } elsif ($else_if_line =~ @@ -269,7 +270,7 @@ sub process_else_if if ($end_lineno != $else_if_lineno) { my $next_lineno = $end_lineno + 1; - $output_code .= "#line ${next_lineno} \"tab-complete.in.c\"\n"; + $output_code .= "#line ${next_lineno} \"${infile}\"\n"; } } diff --git a/src/bin/psql/meson.build b/src/bin/psql/meson.build index b7c026c900b..cbc71f7e8ad 100644 --- a/src/bin/psql/meson.build +++ b/src/bin/psql/meson.build @@ -27,8 +27,8 @@ tabcomplete = custom_target('tabcomplete', input: 'tab-complete.in.c', output: 'tab-complete.c', command: [ - perl, files('gen_tabcomplete.pl'), files('tab-complete.in.c'), - '--outfile', '@OUTPUT@', '@INPUT@', + perl, files('gen_tabcomplete.pl'), '@INPUT@', + '--outfile', '@OUTPUT@', ], ) generated_sources += tabcomplete