From fd6d99f49e14785b3c84eaf12c9ae787ee93700d Mon Sep 17 00:00:00 2001 From: wpaul Date: Wed, 28 May 1997 04:38:30 +0000 Subject: Resolve conflicts. --- include/rpcsvc/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'include/rpcsvc/Makefile') diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index 3b1a77c..76873f3 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,24 +1,27 @@ # from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC -# $Id$ +# $Id: Makefile,v 1.12 1996/08/30 22:36:45 peter Exp $ .SUFFIXES: .x RPCCOM = rpcgen -HDRS= klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ +HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \ - ypxfrd.h -XFILES= bootparam_prot.x klm_prot.x mount.x nfs_prot.x nlm_prot.x \ + ypxfrd.h ypupdate_prot.h nis.h nis_cache.h nis_callback.h \ + bootparam_prot.h crypt.h +XFILES= bootparam_prot.x key_prot.x klm_prot.x mount.x nfs_prot.x nlm_prot.x \ rex.x rnusers.x rquota.x rstat.x rwall.x sm_inter.x spray.x \ - yppasswd.x yp.x ypxfrd.x -HFILES= yp_prot.h ypclnt.h + yppasswd.x yp.x ypxfrd.x ypupdate_prot.x nis.x nis_cache.x nis_object.x \ + nis_callback.x crypt.x +HFILES= yp_prot.h ypclnt.h nis_db.h nis_tags.h nislib.h CLEANFILES+= ${HDRS} all: ${HDRS} +# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -C -m 444 \ ${HFILES:S;^;${.CURDIR}/;} \ ${XFILES:S;^;${.CURDIR}/;} \ ${HDRS} \ -- cgit v1.1