From b6873eddb30b5fed60781e7c92926f7019dea74f Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 8 Dec 2007 02:33:20 +0000 Subject: [PATCH] fix mswin32/Makefile so mswin32 zipfile properly includes nselib-bin directory. Thanks to Rob Nicholls for the report --- CHANGELOG | 7 +++++++ mswin32/Makefile | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4cb7dca91..689eb71ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,11 @@ # Nmap Changelog ($Id$); -*-text-*- + +4.49RC5 + +o Fix mswin32/Makefile so that the new nselib-bin directory is + properly included in the Nmap win32 zipfile distribution. Thanks + to Rob Nicholls for reporting the problem. + 4.49RC4 o David did a huge OS fingerprint integration marathon, going through diff --git a/mswin32/Makefile b/mswin32/Makefile index 2b1b1bb33..97e5e749e 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -5,7 +5,6 @@ export NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' COMMA_VERSION=$(shell echo $(NMAP_NUM_VERSION) | tr '.' ',') LOGLOC=c:nmapbuild.log NSE_FILES = scripts/script.db scripts/*.nse -NSE_LIB_FILES = nselib/*.lua nselib-bin/*.dll winbuild: # VCExpress.exe is devenv.com with the commercial Visual Studio suite instead of VC++ Express @@ -25,7 +24,8 @@ winbuild: mkdir nmap-$(NMAP_VERSION)/scripts cd Release && cp -f $(NSE_FILES) ../nmap-$(NMAP_VERSION)/scripts/ mkdir nmap-$(NMAP_VERSION)/nselib - cd Release && cp -f $(NSE_LIB_FILES) ../nmap-$(NMAP_VERSION)/nselib/ + cp -a Release/nselib nmap-$(NMAP_VERSION) + cp -a Release/nselib-bin nmap-$(NMAP_VERSION) zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION) cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) mkdir nmap-$(NMAP_VERSION)/zenmap