mirror of
https://github.com/nmap/nmap.git
synced 2025-12-11 10:19:03 +00:00
merge soc07 r5024:5030 - remove unnecessary (and misspelled) moreinfo attribute and values; make nmap-dev directory a variable rather than hardcode it; Update version number; regenerated configure script
This commit is contained in:
@@ -11,6 +11,7 @@ mandir = @mandir@
|
|||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
nmapdatadir = @datadir@/nmap
|
nmapdatadir = @datadir@/nmap
|
||||||
deskdir = $(prefix)/share/applications
|
deskdir = $(prefix)/share/applications
|
||||||
|
NMAPDEVDIR=~/nmap-dev
|
||||||
|
|
||||||
export NBASEDIR=@NBASEDIR@
|
export NBASEDIR=@NBASEDIR@
|
||||||
export NSOCKDIR=@NSOCKDIR@
|
export NSOCKDIR=@NSOCKDIR@
|
||||||
@@ -125,11 +126,11 @@ debug:
|
|||||||
|
|
||||||
# Make the Nmap tarball
|
# Make the Nmap tarball
|
||||||
distro:
|
distro:
|
||||||
cd ../nmap-dev && $(MAKE) distro
|
cd $(NMAPDEVDIR) && $(MAKE) distro
|
||||||
|
|
||||||
# Update the web site
|
# Update the web site
|
||||||
web:
|
web:
|
||||||
cd ../nmap-dev && $(MAKE) web
|
cd $(NMAPDEVDIR) && $(MAKE) web
|
||||||
|
|
||||||
clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@
|
clean: @LUA_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ nmapfe_clean nsock_clean nbase_clean my_clean @NSELIB_CLEAN@
|
||||||
|
|
||||||
|
|||||||
4
nmap.h
4
nmap.h
@@ -253,8 +253,8 @@ void *realloc();
|
|||||||
#ifndef NMAP_VERSION
|
#ifndef NMAP_VERSION
|
||||||
/* Edit this definition only within the quotes, because it is read from this
|
/* Edit this definition only within the quotes, because it is read from this
|
||||||
file by the makefiles. */
|
file by the makefiles. */
|
||||||
#define NMAP_VERSION "4.21ALPHA5"
|
#define NMAP_VERSION "4.22SOC1"
|
||||||
#define NMAP_NUM_VERSION "4.21.0.5"
|
#define NMAP_NUM_VERSION "4.22.0.1"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* User configurable #defines: */
|
/* User configurable #defines: */
|
||||||
|
|||||||
Reference in New Issue
Block a user