diff options
| author | Ed J <mohawk2@users.noreply.github.com> | 2018-04-03 20:15:47 +0100 |
|---|---|---|
| committer | Ed J <mohawk2@users.noreply.github.com> | 2018-04-03 20:15:47 +0100 |
| commit | f1d6e6b8938440c2e25ba8cb667ebf45843d22a7 (patch) | |
| tree | 5b7faa1a5e0a97a4af273a2859877eb4d3ae9f74 | |
| parent | a90a2a10bc12265a1809716965abf23af2170219 (diff) | |
put glob in better place to dodge wildcard problems on Win32 gmake 4.2.1
| -rw-r--r-- | Makefile.PL | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL index edd7c12..f4ab2e4 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -120,7 +120,7 @@ SAVE_J2SDK my $javac = File::Spec->catfile($jdk_dir, $jdk_bin, 'javac' . $ext) ; my $jar = File::Spec->catfile($jdk_dir, $jdk_bin, 'jar' . $ext) ; my $src_dir = File::Spec->catdir('Java', 'sources', 'org', 'perl', 'inline', 'java') ; -my $src = File::Spec->catfile($src_dir, '*.java') ; +my @src = glob File::Spec->catfile($src_dir, '*.java') ; my $obj_dir = File::Spec->catdir('Java', 'classes') ; my $server_arch = File::Spec->catfile(qw(lib Inline Java InlineJavaServer.jar)) ; my $user_arch = File::Spec->catfile(qw(lib Inline Java InlineJavaUser.jar)) ; @@ -137,7 +137,7 @@ my $INST_ARCHLIB = '' ; sub MY::postamble { my $this = shift ; - my $java_src = join(' ', glob($src), File::Spec->catfile($obj_dir, 'InlineJava.properties')) ; + my $java_src = join(' ', @src, File::Spec->catfile($obj_dir, 'InlineJava.properties')) ; my $make = <<MAKE ; # Added by Inline::Java installation @@ -145,7 +145,7 @@ JAVA_SRC=$java_src java.ts: \$(JAVA_SRC) \@\$(MKPATH) $obj_dir - "$javac" -deprecation -g -d $obj_dir $src + "$javac" -deprecation -g -d $obj_dir @src \@\$(TOUCH) java.ts $server_arch : java.ts |