On Mon, Nov 16, 1998, Trung Tran-Duc wrote:
> Ooops. We have problem with patching Makefile on Win32. I'll see to it
> tomorrow.
I've looked at it. The appended patch solves it for me. Please try it out
also yourself, Trung. We have to make sure the Win32-stuff doesn't work as
expected for 2.1.0. Thanks for your immediate feedback.
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
Index: configure.bat
===================================================================
RCS file: /e/apache/SSL/REPOS/mod_ssl/pkg.mod_ssl/configure.bat,v
retrieving revision 1.17
diff -u -r1.17 configure.bat
--- configure.bat 1998/11/15 15:22:10 1.17
+++ configure.bat 1998/11/16 18:03:02
@@ -85,7 +85,7 @@
if ($V_MODSSL =~ m|(\d+).(\d+)b(\d+)|) {
$V_MODSSL_NUM = sprintf("%d%02d0%02d", $1, $2, $3);
}
-else {
+if ($V_MODSSL =~ m|(\d+).(\d+)\.(\d+)|) {
$V_MODSSL_NUM = sprintf("%d%02d1%02d", $1, $2, $3);
}
@@ -333,7 +333,7 @@
print "$prefixe creating: [DIR] htdocs\\manual\\mod\mod_ssl\n";
system("md $apache\\htdocs\\manual\\mod\\mod_ssl");
}
-my @F = glob("pkg.ssldoc\\ssl_*");
+@F = glob("pkg.ssldoc\\ssl_*");
push(@F, "pkg.ssldoc\\index.html");
foreach $f (@F) {
my $b = $f;
@@ -357,9 +357,9 @@
$data = '';
$data .= $_ while (<FP>);
close(FP);
-$data =~ s|(\n\s+)(cd modules\\proxy.+?ApacheModuleProxy.mak\n)$|$1cd
modules\\ssl$1nmake /nologo CFG="mod_ssl - Win32 %LONG%" -f Makefile$1cd ..\\..$1$2|s;
-$data =~ s|(\n\s+)(copy modules\\proxy\\.*)$|$1copy modules\\ssl\\ApacheModuleSSL.dll
\$\(INSTDIR\)\\modules$1$2|s;
-$data =~ s|(\n\s+)(cd modules\\proxy.+?ApacheModuleProxy.mak\s+clean\n)$|$1cd
modules\\ssl$1nmake /nologo CFG="mod_ssl - Win32 %LONG%" -f Makefile clean$1cd
..\\..$1$2|s;
+$data =~ s|(\n\s+)(cd modules\\proxy\s*\n[^\n]+ApacheModuleProxy\.mak\n)|$1cd
+modules\\ssl$1nmake /nologo CFG="mod_ssl - Win32 %LONG%" -f Makefile$1cd ..\\..$1$2|s;
+$data =~ s|(\n\s+)(copy modules\\proxy\\.*)|$1copy modules\\ssl\\ApacheModuleSSL.dll
+\$\(INSTDIR\)\\modules$1$2|s;
+$data =~ s|(\n\s+)(cd modules\\proxy\s*\n[^\n]+ApacheModuleProxy\.mak\s+clean\n)|$1cd
+modules\\ssl$1nmake /nologo CFG="mod_ssl - Win32 %LONG%" -f Makefile clean$1cd
+..\\..$1$2|s;
open(FP, ">$apache\\src\\Makefile.nt") || die "$!";
print FP $data;
close(FP);
______________________________________________________________________
Apache Interface to SSLeay (mod_ssl) www.engelschall.com/sw/mod_ssl/
Official Support Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
