Removing last reference to NETBSDINCLUDES

Also removing minix-config.inc and placing its content in
Makefile.inc, as the file is modified anyway. Simplifies diff.

Change-Id: I6262fdb790a5455b59e07acdccdc221fd5dd41f8

diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index e1af10298e15b06516d830716a7c5ee3d020e78b..11019198c3c1246fe380a85ac869501ce12307c1 100644 (file)
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -17,8 +17,13 @@
 # The Hesiod functions are always in libc. To choose that getpwent() and friends
 # actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
 .if defined(__MINIX)
-.include "minix-config.inc"
-.endif
+USE_INET6=no
+MKYP=no #requires RPC
+USE_JEMALLOC=no
+USE_MINIXMALLOC=yes
+USE_FORT=no
+USE_LIBTRE=no
+.endif # defined(__MINIX)
 
 USE_FORT?=     yes
 

diff --git a/lib/libc/minix-config.inc b/lib/libc/minix-config.inc
deleted file mode 100644 (file)
index 25001f7..0000000
--- a/lib/libc/minix-config.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-NETBSDINCLUDES= /usr/include/
-
-USE_INET6=no
-
-MKYP=no #requires RPC
-USE_JEMALLOC=no
-USE_MINIXMALLOC=yes
-USE_FORT=no
-USE_LIBTRE=no
-
-NOGCCERROR:= yes
-NOCLANGERROR:= yes