From 739efa680157ed6950632a9609f54e34f99d7b5b Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 18 Jan 2017 14:21:54 +0000 Subject: [PATCH] Backport r35997 from 7.25BETA1: Fix double /Applications install issue on OS X --- CHANGELOG | 4 ++++ macosx/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0f9a40ab3..6e73d7a33 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # 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 directory is found. Patches contributed by [Varunram Ganesh] and [Sai Sundhar] diff --git a/macosx/Makefile b/macosx/Makefile index c3010ef82..3f2f20582 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -200,8 +200,8 @@ export CC ARCHFLAGS CPPFLAGS CFLAGS CXXFLAGS LDFLAGS stage-zenmap: export-$(ZENMAP_BUILD_DIR) cd $(ZENMAP_BUILD_DIR)/zenmap && install_scripts/macosx/make-bundle.sh rm -rf $(ZENMAP_STAGING_DIR) - mkdir -p $(ZENMAP_STAGING_DIR)/Applications - cp -rf $(ZENMAP_BUILD_DIR)/zenmap/dist/Zenmap.app $(ZENMAP_STAGING_DIR)/Applications/ + mkdir -p $(ZENMAP_STAGING_DIR) + cp -rf $(ZENMAP_BUILD_DIR)/zenmap/dist/Zenmap.app $(ZENMAP_STAGING_DIR) stage-ndiff: export-$(NDIFF_BUILD_DIR) mkdir -p $(NDIFF_STAGING_DIR)/usr/local/bin