Re: [PATCH} perlio and threading @ 10576 + report

[p5sagit/p5-mst-13.2.git] / win32 / config_h.PL

diff --git a/win32/config_h.PL b/win32/config_h.PL
index 850b134..a0ee22d 100644 (file)
--- a/win32/config_h.PL
+++ b/win32/config_h.PL
@@ -11,10 +11,13 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
   $opt{$1}=$2;
   shift(@ARGV);
  }
+
+$opt{CONFIG_H} ||= 'config.h';
+
 my $patchlevel = $opt{INST_VER};
 $patchlevel =~ s|^[\\/]||;
-$patchlevel =~ s|~VERSION~|$]|g;
-$patchlevel ||= $];
+$patchlevel =~ s|~VERSION~|$Config{version}|g;
+$patchlevel ||= $Config{version};
 $patchlevel = qq["$patchlevel"];
 
 open(SH,"<$name") || die "Cannot open $name:$!";
@@ -24,6 +27,8 @@ while (<SH>)
  }
 ($term,$file,$pat) = /^sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
 
+$file =~ s/^\$(\w+)$/$opt{$1}/g;
+
 my $str = "sub munge\n{\n";
 
 while ($pat =~ s/-e\s+'([^']*)'\s*//)
@@ -40,7 +45,7 @@ eval $str;
 die "$str:$@" if $@;
 
 open(H,">$file.new") || die "Cannot open $file.new:$!";
-binmode H;             # no CRs (which cause a spurious rebuild)
+#binmode H;            # no CRs (which cause a spurious rebuild)
 while (<SH>)
  {
   last if /^$term$/o;
@@ -49,12 +54,12 @@ while (<SH>)
   munge();
   s/\\\$/\$/g;
   s#/[ *\*]*\*/#/**/#;
-  if (/^\s*#define\s+(PRIVLIB|SITELIB)_EXP/)
+  if (/^\s*#define\s+(PRIVLIB|SITELIB|VENDORLIB)_EXP/)
    {
-     $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "(aTHX_ $patchlevel))\t/**/\n";
+     $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "($patchlevel))\t/**/\n";
    }
   # incpush() handles archlibs, so disable them
-  elsif (/^\s*#define\s+(ARCHLIB|SITEARCH)_EXP/)
+  elsif (/^\s*#define\s+(ARCHLIB|SITEARCH|VENDORARCH)_EXP/)
    {
      $_ = "/*#define ". $1 . "_EXP \"\"\t/**/\n";
    }