diff options
| author | Yitzchak Scott-Thoennes <sthoenna@efn.org> | 2003-11-24 00:11:36 -0800 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2003-11-24 21:24:46 +0000 |
| commit | dfc05e5b69279e317155520cec7e590d9c42a6bc (patch) | |
| tree | b04c7baecd6347ad7dcb7f6de737be43858fe70e | |
| parent | 0ed299501d408b6e22065c36966752a861574a3d (diff) | |
| download | perl-dfc05e5b69279e317155520cec7e590d9c42a6bc.tar.gz | |
remove hardcoded version number from cygwin/perlld.in
Message-ID: <20031124161136.GC2656@efn.org>
p4raw-id: //depot/perl@21783
| -rw-r--r-- | cygwin/Makefile.SHs | 5 | ||||
| -rw-r--r-- | cygwin/perlld.in | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs index ffe4815787..dd75ccfa4f 100644 --- 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 773bb66e99..0e30c39905 100644 --- 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 { |