httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0 Makefile.win
Date Mon, 15 Mar 2004 21:38:07 GMT
wrowe       2004/03/15 13:38:07

  Modified:    .        Tag: APACHE_2_0_BRANCH Makefile.win
  Log:
    Backport source-build change for Win32 to accomodate the elimiation
    of ssl-std.conf.  (rev 1.136 - 1.138)  Substitute all fields correctly
    from ssl-std.conf.in, and then only if openssl is detected.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.120.2.14 +8 -1      httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.120.2.13
  retrieving revision 1.120.2.14
  diff -u -r1.120.2.13 -r1.120.2.14
  --- Makefile.win	18 Nov 2003 00:46:02 -0000	1.120.2.13
  +++ Makefile.win	15 Mar 2004 21:38:07 -0000	1.120.2.14
  @@ -630,8 +630,9 @@
   <<
   	if not exist "$(INSTDIR)\conf\httpd.conf" \
   	    copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
  +!IF EXIST("srclib\openssl")
   	copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
  -	-awk -f <<script.awk "docs/conf/ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
  +	-awk -f <<script.awk "docs/conf/ssl-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
       BEGIN { 
   	serverroot = ARGV[2];
   	delete ARGV[2];
  @@ -641,11 +642,17 @@
       }
       {
   	gsub( /@@ServerRoot@@/, serverroot );
  +	gsub( /@exp_runtimedir@/, "logs" );
  +	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
  +	gsub( /@exp_logfiledir@/, "logs" );
  +	gsub( /@exp_sysconfdir@/, "conf" );
  +	gsub( /@exp_cgidir@/, serverroot "/cgi" );
   	print $$0;
       }
   <<
   	if not exist "$(INSTDIR)\conf\ssl.conf" \
   	    copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"
  +!ENDIF
   	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
       { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {
   	  sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" ); 
  
  
  

Mime
View raw message