Attachment #15027 for bug #34915

View | Details | Raw Unified | Return to bug 34915
Collapse All | Expand All




<<
	if not exist "$(INSTDIR)\conf\httpd.conf" \
	    copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"
	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\extra\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];

	print $$0;
    }
<<
	if not exist "$(INSTDIR)\conf\extra\httpd-autoindex.conf" \
	    copy "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" "$(INSTDIR)\conf\extra\httpd-autoindex.conf"
	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\extra\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];

<<
	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\extra\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];

<<
	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\extra\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];

<<
	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\extra\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];

<<
	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\extra\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];

<<
	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\extra\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];

<<
	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\extra\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\extra\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\extra\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\extra\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"

Return to bug 34915

Lines 661-667 Link Here

(-)Makefile.win.orig (-13 / +13 lines)
661	<<	661	<<
662	if not exist "$(INSTDIR)\conf\httpd.conf" \	662	if not exist "$(INSTDIR)\conf\httpd.conf" \
663	copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"	663	copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"
664	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\httpd-autoindex.conf" <.y	664	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" <.y
665	-awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"	665	-awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"
666	BEGIN {	666	BEGIN {
667	serverroot = ARGV[2];	667	serverroot = ARGV[2];
Lines 675-683 Link Here
675	print $$0;	675	print $$0;
676	}	676	}
677	<<	677	<<
678	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \	678	if not exist "$(INSTDIR)\conf\extra\httpd-autoindex.conf" \
679	copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"	679	copy "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" "$(INSTDIR)\conf\extra\httpd-autoindex.conf"
680	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\httpd-dav.conf" <.y	680	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\extra\httpd-dav.conf" <.y
681	-awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"	681	-awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"
682	BEGIN {	682	BEGIN {
683	serverroot = ARGV[2];	683	serverroot = ARGV[2];
Lines 693-699 Link Here
693	<<	693	<<
694	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \	694	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
695	copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"	695	copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
696	copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\httpd-manual.conf" <.y	696	copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\extra\httpd-manual.conf" <.y
697	-awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"	697	-awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"
698	BEGIN {	698	BEGIN {
699	serverroot = ARGV[2];	699	serverroot = ARGV[2];
Lines 709-715 Link Here
709	<<	709	<<
710	if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \	710	if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \
711	copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"	711	copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"
712	copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\httpd-multilang-errordoc.conf" <.y	712	copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" <.y
713	-awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"	713	-awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"
714	BEGIN {	714	BEGIN {
715	serverroot = ARGV[2];	715	serverroot = ARGV[2];
Lines 725-731 Link Here
725	<<	725	<<
726	if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \	726	if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \
727	copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"	727	copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"
728	copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\httpd-ssl.conf" <.y	728	copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" <.y
729	-awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"	729	-awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"
730	BEGIN {	730	BEGIN {
731	serverroot = ARGV[2];	731	serverroot = ARGV[2];
Lines 746-752 Link Here
746	<<	746	<<
747	if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \	747	if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \
748	copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"	748	copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"
749	copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\httpd-userdir.conf" <.y	749	copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" <.y
750	-awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"	750	-awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"
751	BEGIN {	751	BEGIN {
752	serverroot = ARGV[2];	752	serverroot = ARGV[2];
Lines 763-769 Link Here
763	<<	763	<<
764	if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \	764	if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \
765	copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"	765	copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"
766	copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\httpd-mpm.conf" <.y	766	copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" <.y
767	-awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"	767	-awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"
768	BEGIN {	768	BEGIN {
769	serverroot = ARGV[2];	769	serverroot = ARGV[2];
Lines 780-795 Link Here
780	<<	780	<<
781	if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \	781	if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \
782	copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"	782	copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"
783	copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\httpd-default.conf" <.y	783	copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\extra\httpd-default.conf" <.y
784	if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \	784	if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \
785	copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"	785	copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"
786	copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\httpd-info.conf" <.y	786	copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\extra\httpd-info.conf" <.y
787	if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \	787	if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \
788	copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"	788	copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"
789	copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\httpd-languages.conf" <.y	789	copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\extra\httpd-languages.conf" <.y
790	if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \	790	if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \
791	copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"	791	copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"
792	copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\httpd-vhosts.conf" <.y	792	copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" <.y
793	if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \	793	if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \
794	copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"	794	copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"
795	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"	795	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"