From ac60e4b431fe6959d9d7b377048b7c0e74abc86c Mon Sep 17 00:00:00 2001 From: david Date: Sat, 13 Jun 2009 00:05:15 +0000 Subject: [PATCH] Use @BASE to export build directories, not @HEAD, so I can build from a specific revision if I have to. Don't rebuild the script database. There are new makefile targets to handle this and we decided that if it's broken it's better for it to be broken on the Mac too. --- macosx/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/macosx/Makefile b/macosx/Makefile index a46602fe4..531801828 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -55,19 +55,18 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): stage-nmap stage-ncat stage-ndiff stage-zenmap export-%: rm -rf $* -# 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 +# Using @BASE discards local changes. + svn export ..@BASE $* + svn export ../nbase@BASE $*/nbase + svn export ../ncat@BASE $*/ncat + svn export ../nsock@BASE $*/nsock + svn export ../zenmap@BASE $*/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)