Commit 4a266ed0 authored by Joshua Slive's avatar Joshua Slive
Browse files

Bring the windows config file in line with the simplifications 

of the main httpd.conf.

Make a vain attempt to modify Makefile.win appropriately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160989 13f79535-47bb-0310-9956-ffa450edef68
parent dbeed063

Makefile.win

+125 −14
Original line number Diff line number Diff line
@@ -475,6 +475,9 @@ _install: 
	-mkdir "$(INSTDIR)\bin\iconv"

	-mkdir "$(INSTDIR)\cgi-bin"

	-mkdir "$(INSTDIR)\conf"

	-mkdir "$(INSTDIR)\conf\extra"

	-mkdir "$(INSTDIR)\conf\original"

	-mkdir "$(INSTDIR)\conf\original\extra"

	-mkdir "$(INSTDIR)\error"

	-mkdir "$(INSTDIR)\htdocs"

	-mkdir "$(INSTDIR)\manual"
@@ -634,14 +637,14 @@ BEGIN { 
	copy $(LONG)\libhttpd.lib 			"$(INSTDIR)\lib" <.y

	copy modules\dav\main\$(LONG)\mod_dav.exp 	"$(INSTDIR)\lib" <.y

	copy modules\dav\main\$(LONG)\mod_dav.lib 	"$(INSTDIR)\lib" <.y

	copy docs\conf\magic "$(INSTDIR)\conf\magic.default" <.y

	copy docs\conf\magic "$(INSTDIR)\conf\original\magic" <.y

	if not exist "$(INSTDIR)\conf\magic" \

	    copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"

	copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default" <.y

	    copy "$(INSTDIR)\conf\original\magic" "$(INSTDIR)\conf\magic"

	copy docs\conf\mime.types "$(INSTDIR)\conf\original\mime.types" <.y

	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" <.y

	-awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"

	    copy "$(INSTDIR)\conf\original\mime.types" "$(INSTDIR)\conf\mime.types"

	copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\original\httpd.conf" <.y

	-awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\original\httpd.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];
@@ -657,10 +660,73 @@ BEGIN { 
    }

<<

	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.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"

	    copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"

	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\httpd-autoindex.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /@exp_iconsdir@/, serverroot "/icons" );

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"

	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\httpd-dav.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /@@ServerRoot@@/, serverroot );

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"

	copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\httpd-manual.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /@exp_manualdir@/, serverroot "/manual" );

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"

	copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\httpd-multilang-errordoc.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /@exp_errordir@/, serverroot "/error" );

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"

	copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\httpd-ssl.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];
@@ -674,13 +740,58 @@ BEGIN { 
	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );

	gsub( /@exp_logfiledir@/, "logs" );

	gsub( /@exp_sysconfdir@/, "conf" );

	gsub( /@exp_cgidir@/, serverroot "/cgi" );

	gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\ssl.conf" \

	    copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"

!ENDIF

	if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"

	copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\httpd-userdir.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /public_html/, "\"My Documents/My Website\"" );

	gsub( /\/home/, "C:/WinNT/profiles" ); 

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"

	copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\httpd-mpm.conf" <.y

	-awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"

    BEGIN { 

	serverroot = ARGV[2];

	delete ARGV[2];

	gsub( /\\/, "/", serverroot );

	"cd" | getline root;

	gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );

    }

    {

	gsub( /@rel_runtimedir@/, "logs/" );

	gsub( /\/home/, "C:/WinNT/profiles" ); 

	print $$0;

    }

<<

	if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"

	copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\httpd-default.conf" <.y

	if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"

	copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\httpd-info.conf" <.y

	if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"

	copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\httpd-languages.conf" <.y

	if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"

	copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\httpd-vhosts.conf" <.y

	if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \

	    copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"

	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"

    { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {

	  sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" );

docs/conf/httpd-win.conf

+134 −675

File changed.

Preview size limit exceeded, changes collapsed.