make, lib changes to make gcc/clang format libraries in /usr/lib instead of /usr...

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index 8cbec6517370ce902bd2a331c360cd2a1cea70c0..6a19b7315747cae8afc9b6b3f3dad21f8790be54 100644 (file)
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -68,8 +68,6 @@
 755  root    operator  /var
 /var/log -> /usr/log
 755  root    operator  /usr/log
-755  root    operator  /usr/gnu
-755  root    operator  /usr/gnu/lib
 755  root    operator  /usr/var
 755  root    operator  /usr/var/db
 755  root    operator  /usr/var/db/pkg

diff --git a/kernel/Makefile b/kernel/Makefile
index 6a4cf359d5f9812735db54bf22a26ec2e6b7221e..209f50b686ac1d29d7d2422ffd986178cb4a34e1 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -17,7 +17,7 @@ LDFLAGS+= -.o
 .elif ${COMPILER_TYPE} == "gnu"
 CPPFLAGS+= -ffreestanding -fno-stack-protector
 LDFLAGS+= -T arch/${ARCH}/kernel.lds
-LDFLAGS+= -nostdlib -L/usr/gnu/lib
+LDFLAGS+= -nostdlib -L/usr/lib
 CFLAGS+=-march=i386
 DPADD+=        ${LIBC}
 LDADD+=        -lc

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index ff512aedf3299b121be90e022e7a887462064428..60f8ad8b305734d75a08d8ee95924d7b6614218e 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -474,7 +474,7 @@ INFOMODE?=  ${NONBINMODE}
 .if ${COMPILER_TYPE} == "ack"
 LIBDIR?=       /usr/lib/i386
 .elif ${COMPILER_TYPE} == "gnu"
-LIBDIR?=       /usr/gnu/lib
+LIBDIR?=       /usr/lib
 .endif
 
 LINTLIBDIR?=   /usr/libdata/lint

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index d3eb82457cb667b7c4c58e01807264529c539c1d..2cf2c45772be50cb586f29173289e5e629e4bc69 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -63,7 +63,7 @@ LIB${_lib:tu}=        ${DESTDIR}/usr/lib/lib${_lib}.a
 .if ${COMPILER_TYPE} == "ack"
 LIB${_lib:tu}= ${DESTDIR}/usr/lib/i386/lib${_lib}.a
 .elif ${COMPILER_TYPE} == "gnu"
-LIB${_lib:tu}= ${DESTDIR}/usr/gnu/lib/lib${_lib}.a
+LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
 .endif
 .MADE:         ${LIB${_lib:tu}}        # Note: ${DESTDIR} will be expanded
 .endif