CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 06:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove a few remaining references to NMAPLIBEXECDIR, where compiled NSE modules

Browse source 
used to be installed.
This commit is contained in:
david 2008-09-23 23:25:40 +00:00
parent 41b35795ba
commit 466a760e67
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile.in
View file

@ -9,7 +9,6 @@ bindir = @bindir@
sbindir = @sbindir@
mandir = @mandir@
srcdir = @srcdir@
nmaplibexecdir = @libexecdir@/nmap
nmapdatadir = @datadir@/nmap
deskdir = $(prefix)/share/applications
NMAPDEVDIR=~/nmap-dev
@ -31,7 +30,7 @@ export LIBDNETDIR = @LIBDNETDIR@
ZENMAPDIR = zenmap
NDIFFDIR = ndiff
PYTHON = @PYTHON@
DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" -DNMAPLIBEXECDIR=\"$(nmaplibexecdir)\"
DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
# For mtrace debugging -- see MTRACE define in main.cc for instructions
# Should only be enabled during debugging and not in any real release.
# DEFS += -DMTRACE=1
@ -250,7 +249,7 @@ uninstall: uninstall-nmap $(UNINSTALLZENMAP) @NCAT_UNINSTALL@
uninstall-nmap:
rm -f $(DESTDIR)$(bindir)/$(TARGET)
rm -f $(DESTDIR)$(mandir)/man1/$(TARGET).1
rm -rf $(DESTDIR)$(nmapdatadir) $(DESTDIR)$(nmaplibexecdir)
rm -rf $(DESTDIR)$(nmapdatadir)
uninstall-zenmap:
cd $(ZENMAPDIR) && $(PYTHON) setup.py uninstall

11
nmap.cc
View file

@ -2769,17 +2769,6 @@ int nmap_fetchfile(char *filename_returned, int bufferlen, const char *file) {
}
}
}
/* Check also in libexec because architecture dependent files ought not to
* be installed in /usr/share
*/
if (!foundsomething) {
res = Snprintf(filename_returned, bufferlen, "%s/%s", NMAPLIBEXECDIR, file);
if (res > 0 && res < bufferlen) {
foundsomething = fileexistsandisreadable(filename_returned);
}
}
#else
if (!foundsomething) { /* Try the nMap directory */
char fnbuf[MAX_PATH];