Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879

Move the NOTICE file to the install dir

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

diff --git a/build.xml b/build.xml
index a804f0b..7f39a34 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -338,7 +338,6 @@
     <copy todir="${tomcat.build}/webapps/docs">
       <fileset dir=".">
         <include name="BUILDING.txt"/>
-        <include name="NOTICE"/>
         <include name="RUNNING.txt"/>
       </fileset>
     </copy>

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index d306320..88ceec5 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -134,6 +134,7 @@ Section "Core" SecTomcatCore
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
+  File NOTICE
   SetOutPath $INSTDIR\lib
   File /r lib\*.*
   SetOutPath $INSTDIR\logs