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:20:15 GMT
wrowe       2004/03/15 13:20:15

  Modified:    .        Makefile.win
  Log:
    Bugfix 2 - fix the rest of the subst codes for ssl.conf on Win32.
  
  Revision  Changes    Path
  1.138     +6 -1      httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- Makefile.win	15 Mar 2004 20:01:07 -0000	1.137
  +++ Makefile.win	15 Mar 2004 21:20:15 -0000	1.138
  @@ -646,7 +646,7 @@
   	    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];
  @@ -656,6 +656,11 @@
       }
       {
   	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;
       }
   <<
  
  
  

Mime
View raw message