PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00
Code Issues Projects Releases Wiki Activity

Backport r35997 from 7.25BETA1: Fix double /Applications install issue on OS X

Browse Source
This commit is contained in:
dmiller
2017-01-18 14:21:54 +00:00
parent 26d37f7bb0
commit 739efa6801
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o [Zenmap] Fixed a recurring installation problem on OS X/macOS where Zenmap
was installed to /Applications/Applications/Zenmap.app instead of
/Applications/Zenmap.app.
o [Zenmap][GH#639] Zenmap will no longer crash when no suitable temporary o [Zenmap][GH#639] Zenmap will no longer crash when no suitable temporary
directory is found. Patches contributed by [Varunram Ganesh] and [Sai Sundhar] directory is found. Patches contributed by [Varunram Ganesh] and [Sai Sundhar]

4
macosx/Makefile
View File

@@ -200,8 +200,8 @@ export CC ARCHFLAGS CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
stage-zenmap: export-$(ZENMAP_BUILD_DIR) stage-zenmap: export-$(ZENMAP_BUILD_DIR)
cd $(ZENMAP_BUILD_DIR)/zenmap && install_scripts/macosx/make-bundle.sh cd $(ZENMAP_BUILD_DIR)/zenmap && install_scripts/macosx/make-bundle.sh
rm -rf $(ZENMAP_STAGING_DIR) rm -rf $(ZENMAP_STAGING_DIR)
mkdir -p $(ZENMAP_STAGING_DIR)/Applications mkdir -p $(ZENMAP_STAGING_DIR)
cp -rf $(ZENMAP_BUILD_DIR)/zenmap/dist/Zenmap.app $(ZENMAP_STAGING_DIR)/Applications/ cp -rf $(ZENMAP_BUILD_DIR)/zenmap/dist/Zenmap.app $(ZENMAP_STAGING_DIR)
stage-ndiff: export-$(NDIFF_BUILD_DIR) stage-ndiff: export-$(NDIFF_BUILD_DIR)
mkdir -p $(NDIFF_STAGING_DIR)/usr/local/bin mkdir -p $(NDIFF_STAGING_DIR)/usr/local/bin