You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2022/09/10 11:28:36 UTC

svn commit: r1903962 - /spamassassin/trunk/Makefile.PL

Author: sidney
Date: Sat Sep 10 11:28:35 2022
New Revision: 1903962

URL: http://svn.apache.org/viewvc?rev=1903962&view=rev
Log:
Bug 8038 - work around quirk of newer Extutils::MakeMaker on Windows with dmake

Modified:
    spamassassin/trunk/Makefile.PL

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1903962&r1=1903961&r2=1903962&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Sat Sep 10 11:28:35 2022
@@ -817,7 +817,14 @@ sub _set_macro_PERL_TAINT {
 sub _set_macro_PREPROCESS {
 
   return if get_macro('PREPROCESS');
-  set_macro('PREPROCESS', join(' ', macro_ref('PERL_BIN'), qq{build/preprocessor}));
+  # Bug 8038 - work around quirk of newer Extutils::MakeMaker on Windows with dmake
+  my $perl_bin = get_expanded_macro('FULLPERL');
+  if ($RUNNING_ON_WINDOWS and ($::Config{make} eq 'dmake') and ($perl_bin =~ /^([a-zA-Z]:)?\\"(.*)$/)) {
+    $perl_bin = "\"$1\\$2";
+  } else {
+    $perl_bin = macro_ref('PERL_BIN');
+  }
+  set_macro('PREPROCESS', join(' ', $perl_bin, qq{build/preprocessor}));
 }
 
 # This routine sets the value for CONFIGURE (spamc only).