From 1fba10f142113e2b583209578c6438eac78b56dc Mon Sep 17 00:00:00 2001 From: david Date: Fri, 24 Apr 2009 18:59:27 +0000 Subject: [PATCH] In the Mac build, discard local changes on export and rebuild the script database to remove any entries that might have been added accidentally. --- macosx/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/macosx/Makefile b/macosx/Makefile index 4ec0a702f..a46602fe4 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -55,17 +55,19 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): stage-nmap stage-ncat stage-ndiff stage-zenmap export-%: rm -rf $* - svn export .. $* - svn export ../nbase $*/nbase - svn export ../ncat $*/ncat - svn export ../nsock $*/nsock - svn export ../zenmap $*/zenmap +# Using @HEAD discards local changes. + svn export ..@HEAD $* + svn export ../nbase@HEAD $*/nbase + svn export ../ncat@HEAD $*/ncat + svn export ../nsock@HEAD $*/nsock + svn export ../zenmap@HEAD $*/zenmap stage-nmap: export-$(NMAP_BUILD_DIR) cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff $(CONFIGURE_ARGS) make -C $(NMAP_BUILD_DIR) rm -rf $(NMAP_STAGING_DIR) make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(NMAP_STAGING_DIR)" + `pwd`/$(NMAP_STAGING_DIR)$(PREFIX)/bin/nmap --datadir `pwd`/$(NMAP_STAGING_DIR)$(PREFIX)/share/nmap --script-updatedb stage-ncat: export-$(NCAT_BUILD_DIR) cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff $(CONFIGURE_ARGS)