From owner-p4-projects@FreeBSD.ORG Sun Dec 5 20:19:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF03516A4F0; Sun, 5 Dec 2004 20:19:38 +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 8F15516A4EE for ; Sun, 5 Dec 2004 20:19:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FC5343D2F for ; Sun, 5 Dec 2004 20:19:38 +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 iB5KJckM010288 for ; Sun, 5 Dec 2004 20:19:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5KJcp6010285 for perforce@freebsd.org; Sun, 5 Dec 2004 20:19:38 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Dec 2004 20:19:38 GMT Message-Id: <200412052019.iB5KJcp6010285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 20:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=66486 Change 66486 by peter@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}