Rearrange third-party license files.

docs/3rd-party-licenses.txt

@@ -45,10 +45,10 @@ Zenmap and Ndiff require:
 
 The Windows and Mac OS X binary packages include bundled versions of:
  o GLib, GTK+, ATK, Pango: These libraries are licensed under the GNU
-   LGPL 2, a copy of which is in this directory in the file LGPL-2.
+   LGPL 2, a copy of which is in the file licenses/LGPL-2.
    http://www.gtk.org/
  o Cairo: graphics library. Dual-licensed under the GNU LGPL 2.1 and the
-   MPL 1.1. See the file MPL-1.1 in this directory.
+   MPL 1.1. See the files licenses/LGPL-2.1 and licenses/MPL-1.1.
    http://www.cairographics.org/
  o libgailutil: Accessibility support for GTK+.
  o libpng, jpeg, LibTIFF: Image file format libraries used by GTK+.

mswin32/Makefile

@@ -22,7 +22,7 @@ winbuild:
 	rm -rf nmap-$(NMAP_VERSION)
 	rm -f nmap-$(NMAP_VERSION)-win32.zip
 	mkdir nmap-$(NMAP_VERSION)
-	cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-payloads nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl nse_main.lua ../nmap_performance.reg ../../README-WIN32 ../../docs/LICENSES ../nmap-$(NMAP_VERSION)/
+	cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-payloads nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl nse_main.lua ../nmap_performance.reg ../../README-WIN32 ../../docs/3rd-party-licenses.txt ../nmap-$(NMAP_VERSION)/
 	cp -f OpenSSL/bin/*.dll ./nmap-$(NMAP_VERSION)/
 	mkdir nmap-$(NMAP_VERSION)/scripts
 	cd Release && cp -f $(NSE_FILES) ../nmap-$(NMAP_VERSION)/scripts/
@@ -32,7 +32,7 @@ winbuild:
 	cd Release && for f in `find nselib -name .svn -prune -o -type f -print`; do \
 		cp -f $$f ../nmap-$(NMAP_VERSION)/$$f; \
 	done
-	cd Release && cp -r ../../docs/LGPL-2 ../../docs/LGPL-2.1 ../../docs/MPL-1.1 ../nmap-$(NMAP_VERSION)/
+	cd Release && cp -r ../../docs/licenses ../nmap-$(NMAP_VERSION)/
 	cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION)
 	cp vcredist_x86.exe nmap-$(NMAP_VERSION)
 	cp ../ncat/Release/ncat.exe nmap-$(NMAP_VERSION)

mswin32/nsis/Nmap.nsi

@@ -191,10 +191,8 @@ Section "Nmap Core Files" SecCore
   File ..\..\docs\nmap.xsl 
   File ..\nmap_performance.reg 
   File ..\..\README-WIN32 
-  File ..\..\docs\LICENSES
-  File ..\..\docs\LGPL-2
-  File ..\..\docs\LGPL-2.1
-  File ..\..\docs\MPL-1.1
+  File ..\..\docs\3rd-party-licenses.txt
+  File /r ..\..\docs\licenses
   File libeay32.dll
   File ssleay32.dll
   File /r /x mswin32 /x .svn /x ncat ..\..\scripts