httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-2.0 Makefile.win
Date Thu, 10 Jan 2002 22:06:39 GMT
ianh        02/01/10 14:06:39

  Modified:    .        Makefile.win
  Log:
  set a default port.
  configurable via INSTPORT
  
  Revision  Changes    Path
  1.88      +12 -1     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Makefile.win	10 Jan 2002 08:47:20 -0000	1.87
  +++ Makefile.win	10 Jan 2002 22:06:39 -0000	1.88
  @@ -13,8 +13,13 @@
   # The default installation directory is \Apache2.0. This can be changed
   # with the INSTDIR macro, for example:
   #
  +#
   #   nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
   #
  +# The default install port is 80. This can be changed by the with the
  +# INSTPORT macro, for example:
  +#   nmake /f Makefile.win INSTPORT=80 INSTDIR="d:\Program Files\Apache" installr
  +#
   # Note: this does *NOT* change the compiled in default "server root"
   # Also be aware that certain awk's will not accept backslahed names,
   # so the server root should be given in forward slashes (quoted),
  @@ -72,6 +77,10 @@
   INSTDIR=\Apache2
   !MESSAGE Using default install directory $(INSTDIR)
   !ENDIF 
  +!IF "$(INSTPORT)" == ""
  +INSTPORT=80
  +!MESSAGE Using default install port $(INSTPORT)
  +!ENDIF 
   
   !IFNDEF MAKEOPT
   # Only default the behavior if MAKEOPT= is omitted
  @@ -499,14 +508,16 @@
   	if not exist "$(INSTDIR)\conf\mime.types" \
   	    copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
   	copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf"
  -	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf"
"$(INSTDIR)"
  +	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf"
"$(INSTDIR)" "$(INSTPORT)"
       BEGIN { 
   	srcfl = ARGV[1];
   	dstfl = ARGV[2];
   	serverroot = ARGV[3];
  +	serverport = ARGV[4];
   	gsub( /\\/, "/", serverroot );
   	while ( ( getline < srcfl ) > 0 ) {
   	    gsub( /@@ServerRoot@@/, serverroot );
  +	    gsub( /@@Port@@/, serverport );
   	    print $$0 > dstfl;
   	}
       }
  
  
  

Mime
View raw message