my $MAKE = $Config{make} || 'make';
-$ENV{PERL_MM_OPT} = "INSTALL_BASE=$instdir";
-$ENV{INSTALL_BASE} = $instdir;
+my $escaped_path = $instdir;
+$escaped_path =~ s/\\/\\\\/g;
+if ($escaped_path =~ s/ /\\ /g) {
+ $escaped_path = qq{"$escaped_path"};
+}
+
+$ENV{PERL_MM_OPT} = "INSTALL_BASE=$escaped_path";
+
if ($ENV{MAKEFLAGS}) {
$ENV{MAKEFLAGS} =~ s/PREFIX=[^\s]+//;
$ENV{MAKEFLAGS} =~ s/INSTALL_BASE=[^\s]+//;
my $dir = tempdir(CLEANUP => 1);
my $devnull = devnull;
-diag "Generated app is in $dir";
+note "Generated app is in $dir";
chdir $dir or die "Cannot chdir to $dir: $!";
is $server_script, $server_script_new;
-diag "Installed app is in $instdir";
+note "Installed app is in $instdir";
command_ok( [ $MAKE, 'install' ] );
my $inst_app_dir = catdir($instdir);