From owner-p4-projects@FreeBSD.ORG  Tue Nov 30 01:07:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A06FE16A4D0; Tue, 30 Nov 2004 01:07:39 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7BC7816A4CE
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 01:07:39 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6702043D55
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 01:07:39 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU17d5f048776
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 01:07:39 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU17dJA048773
	for perforce@freebsd.org; Tue, 30 Nov 2004 01:07:39 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Nov 2004 01:07:39 GMT
Message-Id: <200411300107.iAU17dJA048773@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66077 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Nov 2004 01:07:40 -0000

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

Change 66077 by peter@peter_daintree on 2004/11/30 01:06:55

	install includes for neither fun nor profit

Affected files ...

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

Differences ...

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

@@ -228,7 +228,8 @@
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32
+		SHLIBDIR=/usr/lib32 \
+		INCLUDEDIR=/usr/include32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
@@ -238,7 +239,8 @@
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32
+		SHLIBDIR=/usr/lib32 \
+		INCLUDEDIR=/usr/include32
 .endif
 
 # install stage
@@ -414,6 +416,8 @@
 	cd ${.CURDIR}/kerberos5/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
+	cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 .for _dir in lib/libncurses lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
@@ -428,11 +432,14 @@
 
 install32:
 	mkdir -p ${DESTDIR}/usr/lib32	# XXX add to mtree
+	mkdir -p ${DESTDIR}/usr/include32
+	cd ${.CURDIR}/include; ${LIB32MAKE} install
 	cd ${.CURDIR}/lib; ${LIB32MAKE} install
 	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
 .if !defined(NOCRYPT)
 	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
 .endif
+	cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; ${LIB32MAKE} install
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
 .endif