Author: mladen.turk(a)jboss.com Date: 2008-02-05 03:26:06 -0500 (Tue, 05 Feb 2008) New Revision: 1356 Modified: trunk/httpd/httpd-2.2/NMAKEmakefile Log: Use the same conf name for installer Modified: trunk/httpd/httpd-2.2/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/NMAKEmakefile 2008-02-05 08:13:36 UTC (rev 1355) +++ trunk/httpd/httpd-2.2/NMAKEmakefile 2008-02-05 08:26:06 UTC (rev 1356) @@ -109,7 +109,7 @@ @xcopy "$(SRCDIR)\docs\icons" "$(BUILDICO)" /Y /Q /E @xcopy "$(SRCDIR)\docs\docroot" "$(BUILDDOC)" /Y /Q /E @xcopy "$(SRCDIR)\docs\conf\extra" "$(BUILDCFG)\extra" /Y /Q - @copy /Y "$(SRCDIR)\docs\conf\httpd-win.conf" "$(BUILDCFG)\httpd.conf" >NUL + @copy /Y "$(SRCDIR)\docs\conf\httpd-win.conf" "$(BUILDCFG)\httpd.conf.in" >NUL @copy /Y "$(SRCDIR)\docs\conf\charset.conv" "$(BUILDCFG)" >NUL @copy /Y "$(SRCDIR)\docs\conf\mime.types" "$(BUILDCFG)" >NUL @copy /Y "$(SRCDIR)\docs\conf\magic" "$(BUILDCFG)" >NUL