Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 11 Jan 2002 06:40:44 -0000
Message-ID: <20020111064044.16925.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 Makefile.win

wrowe       02/01/10 22:40:44

  Modified:    .        Makefile.win
  Log:
    Some servername goodness (well, if you call 'localhost' good, I don't.)
    Add to that some nits in the overall comments, and drop all the bitty
    copy modules/somemod/*.h include/ fooness, since we need the various
    modules to deposit their droppings into the build tree install/ dir
    just to compile ourselves.
  
  Revision  Changes    Path
  1.89      +21 -28    httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- Makefile.win	10 Jan 2002 22:06:39 -0000	1.88
  +++ Makefile.win	11 Jan 2002 06:40:43 -0000	1.89
  @@ -10,18 +10,18 @@
   #   _cleand    - remove (most) files generated by a Debug build
   #   _browse    - build the browse info file
   #
  -# The default installation directory is \Apache2.0. This can be changed
  -# with the INSTDIR macro, for example:
  +# The following install defaults may be customized;
   #
  +#   Option      Default
  +#   INSTDIR     \Apache2
  +#   PORT        80
  +#   SERVERNAME  localhost
   #
  -#   nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
  +# For example;
   #
  -# 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
  +#   nmake /f Makefile.win PORT=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,
  +# Be aware that certain awk's will not accept backslahed names,
   # so the server root should be given in forward slashes (quoted),
   # preferably with the drive designation!
   
  @@ -75,12 +75,18 @@
   
   !IF "$(INSTDIR)" == ""
   INSTDIR=\Apache2
  -!MESSAGE Using default install directory $(INSTDIR)
  +!MESSAGE INSTDIR not specified, installing to default $(INSTDIR)
   !ENDIF 
  -!IF "$(INSTPORT)" == ""
  -INSTPORT=80
  -!MESSAGE Using default install port $(INSTPORT)
  +!IF "$(PORT)" == ""
  +PORT=80
  +!MESSAGE PORT not specified, using default $(PORT)
  +!MESSAGE To change this use $(MAKE) -f makefile.win PORT=8080 installr
   !ENDIF 
  +!IF "$(SERVERNAME)" == ""
  +SERVERNAME=localhost
  +!MESSAGE SERVERNAME not specified, using default $(SERVERNAME)
  +!MESSAGE To change this use $(MAKE) -f makefile.win PORT=www.example.com installr
  +!ENDIF
   
   !IFNDEF MAKEOPT
   # Only default the behavior if MAKEOPT= is omitted
  @@ -472,19 +478,6 @@
   	xcopy srclib\apr\include\*.h "$(INSTDIR)\include" /d < .a
   	xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < .a
   	xcopy include\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy os\win32\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy server\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy server\mpm\winnt\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\dav\fs\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\dav\main\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\experimental\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\filters\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\generators\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\http\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\loggers\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\mappers\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\ssl\*.h "$(INSTDIR)\include" /d < .a
  -	xcopy modules\proxy\*.h "$(INSTDIR)\include" /d < .a
   	xcopy docs\icons "$(INSTDIR)\icons" /s /d < .a
   	copy srclib\apr\Lib$(SHORT)\apr.lib "$(INSTDIR)\lib"
   	copy srclib\apr-util\Lib$(SHORT)\aprutil.lib "$(INSTDIR)\lib"
  @@ -508,16 +501,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)" "$(INSTPORT)"
  +	-awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
       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 );
  +	    gsub( /@@ServerName@@/, "$(SERVERNAME)" );
  +	    gsub( /@@Port@@/, "$(PORT)" );
   	    print $$0 > dstfl;
   	}
       }