diff --git a/macosx/Makefile b/macosx/Makefile index 0fdec891e..14212c09a 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -2,7 +2,6 @@ # Zenmap, Ncat, and Ndiff. NMAP_VERSION := $(shell echo NMAP_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p') -NMAP_VERSION := $(shell echo NMAP_NUM_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p') #OSX_VERSION=$(shell sw_vers -productVersion | cut -d'.' -f1,2 | tr -d ' ') OSX_VERSION=10.11 OSX_MIN_VERSION = 10.9 @@ -169,7 +168,7 @@ xstage-nping: export-$(NPING_BUILD_DIR) make -C $(NPING_BUILD_DIR) install-nping DESTDIR="`pwd`/$(NPING_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)" openssl.modules: ../nmap.h - sed -i '/ENTITY nmap_version/s/".*"/"$(NMAP_VERSION)"/' $@ + sed -i.bak '/ENTITY nmap_version/s/\".*\"/\"$(NMAP_VERSION)\"/' $@ stage-%: export-tarball openssl.modules jhbuild -m "file://`pwd`/openssl.modules" build $* diff --git a/macosx/openssl.modules b/macosx/openssl.modules index 0d3e52e52..3935d7a7c 100644 --- a/macosx/openssl.modules +++ b/macosx/openssl.modules @@ -1,6 +1,6 @@ + ]>