PERFORCE change 63180 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=63180

Change 63180 by peter at peter_melody on 2004/10/13 23:19:57

	prepare for acid test

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#66 edit

Differences ...

==== //depot/projects/hammer/Makefile.inc1#66 (text+ko) ====

@@ -216,7 +216,7 @@
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 
-LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -f Makefile.inc1 \
+LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_BIND -DNOMAN -DNODOC -DNOINFO \
 		CC="cc ${CCARGS}" \
 		CXX="c++ ${CXXARGS}" \
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
@@ -361,35 +361,40 @@
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
-
+.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
 _build32:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building 32 bit libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/lib/compat/aout usr/libdata/ldscripts \
+    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
     usr/libexec usr/sbin usr/share/misc \
     usr/share/snmp/defs usr/share/snmp/mibs
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-	    -p ${WORLDTMP}/usr/include >/dev/null
+	    -p ${LIB32TMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy
-	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} obj
-	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes
+	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} hierarchy
+	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} obj
+	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} includes
 	cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
 	cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
-	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries 
-.for _t in obj depend all install
+	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
+.for _t in obj depend all
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \
 	    ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t}
 .endfor
-	
 
 _install32:
+	mkdir -p ${DESTDIR}/usr/lib32
+	cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install
+	cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install
+	cd ${.CURDIR}/secure/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install
+	cd ${.CURDIR}/libexec/rtld-elf; MACHINE_ARCH=i386 PROG=ld-elf32.so.1 ${LIB32MAKE} install
+.endif
 
 
 WMAKE_TGTS=
@@ -401,6 +406,9 @@
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
+.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+WMAKE_TGTS+=	_build32
+.endif
 
 buildworld: ${WMAKE_TGTS}
 .ORDER: ${WMAKE_TGTS}
@@ -531,6 +539,9 @@
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
+.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _install32
+.endif
 
 redistribute:
 	@echo "--------------------------------------------------------------"