From 466a760e67f23a72a29804ba225db8ed955b2590 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 23 Sep 2008 23:25:40 +0000
Subject: [PATCH] Remove a few remaining references to NMAPLIBEXECDIR, where
 compiled NSE modules used to be installed.

---
 Makefile.in |  5 ++---
 nmap.cc     | 11 -----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 718ec5e9a..19818e465 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
diff --git a/nmap.cc b/nmap.cc
index 0ffa13c4d..f139abce2 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -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];