From: Ben Gras <ben@minix3.org>
Date: Mon, 13 Sep 2010 16:37:02 +0000 (+0000)
Subject: make, lib changes to make gcc/clang format libraries in /usr/lib instead of /usr... 
X-Git-Tag: v3.2.0~883
X-Git-Url: http://zhaoyanbai.com/repos/man.dnssec-settime.html?a=commitdiff_plain;h=eaa37fd21c891c0fa8925c29a7024b7b78774c34;p=minix.git

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

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index 8cbec6517..6a19b7315 100644
--- 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 6a4cf359d..209f50b68 100644
--- 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 ff512aedf..60f8ad8b3 100644
--- 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 d3eb82457..2cf2c4577 100644
--- 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