Fix for correct names for the descrip.mms file used with MMS/MMK on VMS.

Per review of Andy Lester, also fixed the error message from failed renames.

Also preparation for use of other make programs on VMS with the assumption that no there will be no port of MMK to other platforms even though it is open source.

-John
[EMAIL PROTECTED]
Personal Opinion Only
--- lib/ExtUtils/t/Constant.t_25309     Mon Apr 18 10:44:31 2005
+++ lib/ExtUtils/t/Constant.t   Sun Aug 21 00:12:59 2005
@@ -45,10 +45,16 @@
 $make = $ENV{MAKE} if exists $ENV{MAKE};
 if ($^O eq 'MSWin32' && $make eq 'nmake') { $make .= " -nologo"; }
 
+# VMS may be using something other than MMS/MMK
+my $mms_or_mmk = 0;
+if ($^O eq 'VMS') {
+   $mms_or_mmk = 1 if (($make eq 'MMK') || ($make eq 'MMS'));
+}
+
 # Renamed by make clean
-my $makefile = ($^O eq 'VMS' ? 'descrip' : 'Makefile');
-my $makefile_ext = ($^O eq 'VMS' ? '.mms' : '');
-my $makefile_rename = $makefile . ($^O eq 'VMS' ? '.mms' : '.old');
+my $makefile = ($mms_or_mmk ? 'descrip' : 'Makefile');
+my $makefile_ext = ($mms_or_mmk ? '.mms' : '');
+my $makefile_rename = $makefile . ($mms_or_mmk ? '.mms_old' : '.old');
 
 my $output = "output";
 my $package = "ExtTest";
@@ -250,8 +256,8 @@
 
   check_for_bonus_files ('.', @$files, $output, $makefile_rename, '.', '..');
 
-  rename $makefile_rename, $makefile
-    or die "Can't rename '$makefile_rename' to '$makefile': $!";
+  rename $makefile_rename, $makefile . $makefile_ext
+    or die "Can't rename '$makefile_rename' to '$makefile$makefile_ext': $!";
 
   unlink $output or warn "Can't unlink '$output': $!";
 

Reply via email to