remove hardcoded version number from cygwin/perlld.in

Message-ID: <20031124161136.GC2656@efn.org>

p4raw-id: //depot/perl@21783

diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs
index ffe4815..dd75ccf 100644 (file)
--- a/cygwin/Makefile.SHs
+++ b/cygwin/Makefile.SHs
@@ -53,8 +53,9 @@ $spitshell >>Makefile <<!GROK!THIS!
 
 # perlld parameters
 #
-# this one is pretty mandatory
+# these ones are mandatory
 DLLWRAP = 'dllwrap'
+VERSION = '$version'
 
 # following are optional.
 WRAPDRIVER = gcc
@@ -73,7 +74,7 @@ perlld: $& Makefile ${src}/cygwin/perlld.in
        -e s,@WRAPDRIVER@,\${WRAPDRIVER},g -e s,@DLLTOOL@,\${DLLTOOL},g \\
        -e s,@AS@,\${AS},g -e s,@EXPORT_ALL@,\${EXPORT_ALL},g \\
        -e s,@DEF_EXT@,\${DEF_EXT},g -e s,@EXP_EXT@,\${EXP_EXT},g \\
-       -e s,@LIB_EXT@,\${LIB_EXT},g \\
+       -e s,@LIB_EXT@,\${LIB_EXT},g -e s,@VERSION@,\${VERSION},g \\
        ${src}/cygwin/perlld.in >perlld
 
 !GROK!THIS!

diff --git a/cygwin/perlld.in b/cygwin/perlld.in
index 773bb66..0e30c39 100644 (file)
--- a/cygwin/perlld.in
+++ b/cygwin/perlld.in
@@ -46,7 +46,8 @@ if ($args !~ /\-o (\S+)/) {
     $path =~ s,[/\\](\.[/\\])*,/,g;
   }
   if ($dllname =~ /\./) { $libname =$`; } else { $libname =$dllname; };
-  my $v_e_r_s = '5_9_0';
+  my $v_e_r_s = '@VERSION@';
+  $v_e_r_s =~ tr/./_/;
   if ( $dllname =~ /libperl.*/) { 
     $dllname ="cygperl$v_e_r_s.dll";
   } else {