PERFORCE change 66077 for review

[Peter Wemm]

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

Change 66077 by peter at 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