From 46cc41a1d8353e785d4705f42ba5ec3dd3cf3a51 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Sun, 7 Aug 1994 22:21:14 +0000
Subject: [PATCH] More directory cleanup after YP merge.

---
 lib/libc/Makefile         |  4 ++--
 lib/libc/rpc/Makefile.inc | 20 ++------------------
 lib/libc/xdr/Makefile.inc |  7 +++----
 lib/libc/xdr/xdr_rec.c    |  4 +---
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 0b2403df784c..7df112429c53 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -40,8 +40,8 @@ libkern.${MACHINE}:: ${KMSRCS}
 	cp -p ${.ALLSRC} /sys/libkern/${MACHINE}
 .endif
 
-beforeinstall: tags
-	install -c -o bin -g bin -m 444 tags /var/db/libc.tags
+#beforeinstall: tags
+#	install -c -o bin -g bin -m 444 tags /var/db/libc.tags
 
 tags: ${SRCS}
 	ctags ${.ALLSRC:M*.c}
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 8776d9d8eee9..2f9394f4dc7f 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,15 +1,13 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
 
 .PATH: ${.CURDIR}/rpc ${.CURDIR}/.
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/rpc
 SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
 	clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \
 	clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \
 	pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \
 	pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.c \
 	svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c \
-	svc_tcp.c svc_udp.c xdr.c xdr_array.c xdr_mem.c \
-	xdr_rec.c xdr_reference.c xdr_stdio.c
+	svc_tcp.c svc_udp.c 
 
 #
 # XXX -- rstat.1 and rstat_svc.8 shouldn't really be here
@@ -19,21 +17,7 @@ SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
 #
 
 MAN1+= rpc/rstat.1  
-MAN3+= rpc/bindresvport.3 rpc/getrpcent.3 rpc/getrpcport.3 rpc/rpc.3 rpc/xdr.3
+MAN3+= rpc/bindresvport.3 rpc/getrpcent.3 rpc/getrpcport.3 rpc/rpc.3
 MAN5+= rpc/rpc.5
 MAN8+= rpc/rstat_svc.8
 
-
-UNSUPPORTED+=	xdr_float.c 
-
-HDRS+=	auth.h auth_unix.h clnt.h pmap_clnt.h \
-	pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h svc_auth.h types.h xdr.h
-
-beforeinstall: ${HDRS}
-	@-if [ ! -d ${DESTDIR}/usr/include/rpc ]; then \
-		mkdir ${DESTDIR}/usr/include/rpc; \
-		chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include/rpc; \
-		chmod 755 ${DESTDIR}/usr/include/rpc; \
-	fi
-	cd ${.CURDIR}/rpc; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HDRS} \
-	    ${DESTDIR}/usr/include/rpc
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index f547d9dbe476..b85f2eb12832 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,11 +1,10 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
 
-.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/rpc
-SRCS=	xdr.c xdr_array.c xdr_mem.c \
+.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
+SRCS+=	xdr.c xdr_array.c xdr_mem.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c
 
-MAN3=	xdr/xdr.3
+MAN3+=	xdr/xdr.3
 
 UNSUPPORTED+=	xdr_float.c 
 
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index f2559d4b4f6b..54ed0a388834 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -29,7 +29,7 @@
 #if defined(LIBC_SCCS) && !defined(lint) 
 /*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_rec.c,v 1.1 1993/10/27 05:41:12 paul Exp $";
+static char *rcsid = "$Id: xdr_rec.c,v 1.1 1994/08/07 18:39:33 wollman Exp $";
 #endif
 
 /*
@@ -55,8 +55,6 @@ static char *rcsid = "$Id: xdr_rec.c,v 1.1 1993/10/27 05:41:12 paul Exp $";
 #include <rpc/xdr.h>
 #include <netinet/in.h>
 
-extern long	lseek();
-
 static u_int	fix_buf_size();
 static bool_t	flush_out();
 static bool_t	get_input_bytes();