From a45710eb4de515827d2622ce9703f434270a37c1 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 3 Aug 2005 20:27:06 +0000
Subject: - Remove duplicate setting from LIB32MAKE definition. - Install lib32
 bits using the real install(1) program.

---
 Makefile.inc1 | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2da87a6..0f99eac 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -236,14 +236,8 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \
-		CC="${CC} ${LIB32CC}" \
-		CXX="${CXX} ${LIB32CXX}" \
-		OBJC="${OBJC} ${LIB32OBJC}" \
-		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
-		AS="${AS} --32" \
-		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32
+		-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
+LIB32IMAKE=	${LIB32MAKE:NINSTALL=*}
 .endif
 
 # install stage
@@ -441,12 +435,12 @@ distribute32 install32:
 .else
 	mkdir -p ${DESTDIR}/usr/lib32			# XXX add to mtree
 .endif
-	cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
-	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if !defined(NO_CRYPT)
-	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
-	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 
 
-- 
cgit v1.1