PERFORCE change 66486 for review

[Peter Wemm]

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

Change 66486 by peter at peter_melody on 2004/12/05 20:19:30

	revert more of this mistake, and fix a typo

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#81 edit
.. //depot/projects/hammer/lib/librpcsvc/Makefile#6 edit
.. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#5 edit
.. //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#6 edit

Differences ...

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

@@ -228,8 +228,7 @@
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32 \
-		INCLUDEDIR=/usr/include32
+		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
@@ -239,8 +238,7 @@
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32 \
-		INCLUDEDIR=/usr/include32
+		SHLIBDIR=/usr/lib32
 .endif
 
 # install stage
@@ -436,14 +434,11 @@
 
 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/cc/include; ${LIB32MAKE} install
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
 .endif
 

==== //depot/projects/hammer/lib/librpcsvc/Makefile#6 (text+ko) ====

@@ -18,7 +18,7 @@
 
 RPCCOM = rpcgen -C
 
-INCDIRS= -I${DESTDIR}${INCLUDEDIR}/rpcsvc
+INCDIRS= -I${DESTDIR}/usr/include/rpcsvc
 
 CFLAGS+= -DYP ${INCDIRS}
 

==== //depot/projects/hammer/usr.sbin/amd/amd/Makefile#5 (text+ko) ====

@@ -23,7 +23,7 @@
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
-	 -I${DESTDIR}${INCLUDEDIR}/rpcsvc
+	 -I${DESTDIR}/usr/include/rpcsvc
 
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}

==== //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#6 (text+ko) ====

@@ -6,7 +6,7 @@
 MLINKS=	rpc.lockd.8 lockd.8
 SRCS=	kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
 
-CFLAGS+= -I. -I${DESTDIR}$/usr/include/rpcsvc
+CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
 #WARNS?= 2
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}