Use CRLF line ends in conf/* files installed by the Windows exe installer

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@900729 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/dist.xml b/dist.xml
index 6dfe4d0..3b51f0f 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -329,6 +329,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
     <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
 
+    <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
+    <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
     <!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
          displayed post-install -->
     <fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"