1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Fix some errors in macosx build scripts

This commit is contained in:
dmiller
2021-08-06 17:44:37 +00:00
parent 2181443b63
commit 17b2da7731
2 changed files with 2 additions and 3 deletions

View File

@@ -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 $*

View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE moduleset SYSTEM "moduleset.dtd" [
<!ENTITY nmap_version "7.91">
<!ENTITY nmap_version "7.91SVN">
]>
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>