fixup! meson: prereq: unicode: use option

Author: nbyavuz

src/common/unicode/Makefile

@@ -33,7 +33,7 @@ UnicodeData.txt EastAsianWidth.txt DerivedNormalizationProps.txt CompositionExcl
 unicode_norm_hashfunc.h: unicode_norm_table.h
 
 unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt
-	$(PERL) $< $(CURDIR)
+	$(PERL) $<
 
 unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt
 	$(PERL) $^ >$@

src/common/unicode/generate-unicode_norm_table.pl

@@ -10,21 +10,27 @@
 
 use strict;
 use warnings;
+use Getopt::Long;
 
 use FindBin;
 use lib "$FindBin::RealBin/../../tools/";
 use PerfectHash;
 
-my $directory = $ARGV[0];
-my $output_table_file = "$directory/unicode_norm_table.h";
-my $output_func_file  = "$directory/unicode_norm_hashfunc.h";
+my $output_path = '.';
+
+GetOptions(
+	'output:s'       => \$output_path);
+
+my $output_table_file = "$output_path/unicode_norm_table.h";
+my $output_func_file  = "$output_path/unicode_norm_hashfunc.h";
+
 
 my $FH;
 
 # Read list of codes that should be excluded from re-composition.
 my @composition_exclusion_codes = ();
-open($FH, '<', "$directory/CompositionExclusions.txt")
-  or die "Could not open $directory/CompositionExclusions.txt: $!.";
+open($FH, '<', "$output_path/CompositionExclusions.txt")
+  or die "Could not open $output_path/CompositionExclusions.txt: $!.";
 while (my $line = <$FH>)
 {
 	if ($line =~ /^([[:xdigit:]]+)/)
@@ -39,8 +45,8 @@
 # and character decomposition mapping
 my @characters     = ();
 my %character_hash = ();
-open($FH, '<', "$directory/UnicodeData.txt")
-  or die "Could not open $directory/UnicodeData.txt: $!.";
+open($FH, '<', "$output_path/UnicodeData.txt")
+  or die "Could not open $output_path/UnicodeData.txt: $!.";
 while (my $line = <$FH>)
 {
 

src/common/unicode/meson.build

@@ -27,7 +27,7 @@ update_unicode_targets += \
   custom_target('unicode_norm_table.h',
     input: [unicode_data['UnicodeData.txt'], unicode_data['CompositionExclusions.txt']],
     output: ['unicode_norm_table.h', 'unicode_norm_hashfunc.h'],
-    command: [perl, files('generate-unicode_norm_table.pl'), '@OUTDIR@', '@INPUT@'],
+    command: [perl, files('generate-unicode_norm_table.pl'), '-o', '@OUTDIR@', '@INPUT@'],
     build_by_default: false,
   )