mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 20:51:30 +00:00
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.
This commit is contained in:
@@ -55,19 +55,18 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): stage-nmap stage-ncat stage-ndiff stage-zenmap
|
|||||||
|
|
||||||
export-%:
|
export-%:
|
||||||
rm -rf $*
|
rm -rf $*
|
||||||
# Using @HEAD discards local changes.
|
# Using @BASE discards local changes.
|
||||||
svn export ..@HEAD $*
|
svn export ..@BASE $*
|
||||||
svn export ../nbase@HEAD $*/nbase
|
svn export ../nbase@BASE $*/nbase
|
||||||
svn export ../ncat@HEAD $*/ncat
|
svn export ../ncat@BASE $*/ncat
|
||||||
svn export ../nsock@HEAD $*/nsock
|
svn export ../nsock@BASE $*/nsock
|
||||||
svn export ../zenmap@HEAD $*/zenmap
|
svn export ../zenmap@BASE $*/zenmap
|
||||||
|
|
||||||
stage-nmap: export-$(NMAP_BUILD_DIR)
|
stage-nmap: export-$(NMAP_BUILD_DIR)
|
||||||
cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff $(CONFIGURE_ARGS)
|
cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff $(CONFIGURE_ARGS)
|
||||||
make -C $(NMAP_BUILD_DIR)
|
make -C $(NMAP_BUILD_DIR)
|
||||||
rm -rf $(NMAP_STAGING_DIR)
|
rm -rf $(NMAP_STAGING_DIR)
|
||||||
make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(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)
|
stage-ncat: export-$(NCAT_BUILD_DIR)
|
||||||
cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff $(CONFIGURE_ARGS)
|
cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff $(CONFIGURE_ARGS)
|
||||||
|
|||||||
Reference in New Issue
Block a user