diff -Nurd nmap-7.94.orig/configure nmap-7.94/configure
--- nmap-7.94.orig/configure	2023-05-01 13:44:45.000000000 -0400
+++ nmap-7.94/configure	2024-02-19 01:57:06.000000000 -0500
@@ -7779,9 +7779,8 @@
 fi
 
 
-LDFLAGS="$LDFLAGS -L$NBASEDIR"
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR"
-LIBNBASE_LIBS="-lnbase"
+LIBNBASE_LIBS="$NBASEDIR/libnbase.a"
 
 
 
@@ -7809,9 +7808,8 @@
 fi
 
 
-LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/"
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include"
-LIBNSOCK_LIBS="-lnsock"
+LIBNSOCK_LIBS="$NSOCKDIR/src/libnsock.a"
 
 
 
diff -Nurd nmap-7.94.orig/ncat/Makefile.in nmap-7.94/ncat/Makefile.in
--- nmap-7.94.orig/ncat/Makefile.in	2022-10-21 17:15:45.000000000 -0400
+++ nmap-7.94/ncat/Makefile.in	2024-02-19 01:57:06.000000000 -0500
@@ -47,7 +47,7 @@
 NBASELIB = $(NBASEDIR)/libnbase.a
 
 CC = @CC@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = $(INCLS) @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -65,7 +65,7 @@
 LUA_CFLAGS = @LUA_CFLAGS@
 
 
-CPPFLAGS += $(DEFS) $(INCLS)
+CPPFLAGS += $(DEFS)
 
 SHTOOL = ../shtool
 
@@ -87,7 +87,8 @@
 LUA_SRCS = ncat_lua.c
 LUA_OBJS = ncat_lua.o
 LUA_LIBS = @LIBLUA_LIBS@ -lm
-LUA_CFLAGS += -DHAVE_LUA=1 -I../liblua
+DEFS += -DHAVE_LUA=1
+INCS += -I../liblua
 else
 LUA_SRCS =
 LUA_OBJS =
diff -Nurd nmap-7.94.orig/nping/Makefile.in nmap-7.94/nping/Makefile.in
--- nmap-7.94.orig/nping/Makefile.in	2020-10-05 19:00:30.000000000 -0400
+++ nmap-7.94/nping/Makefile.in	2024-02-19 01:57:06.000000000 -0500
@@ -43,7 +43,7 @@
 # Should only be enabled during debugging and not in any real release.
 # DEFS += -DMTRACE=1
 CXXFLAGS = @CXXFLAGS@ $(DBGFLAGS) $(CCOPT) $(DEFS)
-CPPFLAGS = @CPPFLAGS@ -I$(NBASEDIR) -I$(NSOCKDIR)/include
+CPPFLAGS = -I$(NBASEDIR) -I$(NSOCKDIR)/include @CPPFLAGS@
 export CFLAGS = $(CXXFLAGS)
 # CFLAGS = $(DEFS) $(INCLS)
 STATIC =
diff -Nurd nmap-7.94.orig/nsock/src/Makefile.in nmap-7.94/nsock/src/Makefile.in
--- nmap-7.94.orig/nsock/src/Makefile.in	2017-08-23 04:52:40.000000000 -0400
+++ nmap-7.94/nsock/src/Makefile.in	2024-02-19 01:57:06.000000000 -0500
@@ -17,7 +17,7 @@
 INCLS = -I../include
 CFLAGS = @CFLAGS@ $(CCOPT)
 # CFLAGS = -g -Wall $(DEFS) $(INCLS)
-CPPFLAGS = @CPPFLAGS@ $(DEFS) $(INCLS)
+CPPFLAGS = $(INCLS) @CPPFLAGS@ $(DEFS)
 STATIC =
 SHTOOL = ./shtool
 INSTALL = $(SHTOOL) install
diff -Nurd nmap-7.94.orig/nsock/src/configure nmap-7.94/nsock/src/configure
--- nmap-7.94.orig/nsock/src/configure	2019-05-20 12:21:41.000000000 -0400
+++ nmap-7.94/nsock/src/configure	2024-02-19 01:57:06.000000000 -0500
@@ -5013,9 +5013,8 @@
 
 NSOCKTESTDIR="../tests"
 
-LDFLAGS="$LDFLAGS -L$NBASEDIR"
 CPPFLAGS="$CPPFLAGS -I$NBASEDIR"
-LIBNBASE_LIBS="$LIBS -lnbase"
+LIBNBASE_LIBS="$NBASEDIR/libnbase.a"
 
 
 
diff -Nurd nmap-7.94.orig/nsock/tests/Makefile.in nmap-7.94/nsock/tests/Makefile.in
--- nmap-7.94.orig/nsock/tests/Makefile.in	2022-09-20 19:37:28.000000000 -0400
+++ nmap-7.94/nsock/tests/Makefile.in	2024-02-19 01:57:06.000000000 -0500
@@ -8,7 +8,7 @@
 NBASELIB=$(NBASEDIR)/libnbase.a
 
 CC 	= @CC@
-CPPFLAGS = @CPPFLAGS@ -I../include
+CPPFLAGS = -I../include @CPPFLAGS@
 CFLAGS	= @CFLAGS@
 LDFLAGS	= @LDFLAGS@
 LIBS	= @OPENSSL_LIBS@ @LIBPCAP_LIBS@ @LIBS@