$NetBSD: patch-aa,v 1.4.14.1 2004/07/29 21:54:34 agc Exp $

--- Makefile.orig	2001-05-04 04:29:21.000000000 +1000
+++ Makefile
@@ -74,18 +74,19 @@
 #CC=cc
 #COPT=-O -DNOT_ANSI_C -DPROTOTYPES=0
 # for gcc, use
-CC=gcc
-COPT=-O2 -DPROTOTYPES=1
+#CC=gcc
+#COPT=-O2 -DPROTOTYPES=1
+CFLAGS+=${CFS_CFLAGS}
 
 #1B: paths:
 #some peple like /usr/local/sbin instead of /usr/local/etc
-BINDIR=/usr/local/bin
-ETCDIR=/usr/local/etc
+BINDIR=${PREFIX}/bin
+ETCDIR=${PREFIX}/sbin
 PRINTCMD=enscript -Gr2
 # you only need RSAREF for ESM
 # these paths WILL have to be changed...
-RSALIB=/usr/mab/rsaref/install/rsaref.a
-RINCLUDES=/usr/mab/rsaref/source
+#RSALIB=/usr/mab/rsaref/install/rsaref.a
+#RINCLUDES=/usr/mab/rsaref/source
 
 # if you're a paranoid fascist, you might want to configure
 # default timeouts on the attach command.  If you do,
@@ -229,7 +230,7 @@ RINCLUDES=/usr/mab/rsaref/source
 # (3/3) CONFIGURE: one last thing
 #==========================================================================
 # finally, comment out the next line:
-CC=you_forgot_to_edit_the_makefile
+#CC=you_forgot_to_edit_the_makefile
 
 # now you're done with local configuration.
 
@@ -322,6 +323,7 @@ nfsproto_svr.c: nfsproto.x
 
 nfsproto.h: nfsproto.x
 	rpcgen $(RPCOPTS) -h -o nfsproto.h nfsproto.x
+	./unansi ${OPSYS} nfsproto.h
 
 admproto_xdr.c: admproto.x
 	rpcgen $(RPCOPTS) -c -o admproto_xdr.c admproto.x 
@@ -331,6 +333,7 @@ admproto_svr.c: admproto.x
 
 admproto.h: admproto.x
 	rpcgen $(RPCOPTS) -h -o admproto.h admproto.x
+	./unansi ${OPSYS} admproto.h
 
 admproto_clnt.c: admproto.x
 	rpcgen $(RPCOPTS) -l -o admproto_clnt.c admproto.x 
@@ -359,10 +362,10 @@ printout: $(SRCS) cfs.h mcg.h safer.h ad
 	$(PRINTCMD) $(SRCS) cfs.h mcg.h safer.h admproto.h nfsproto.h
 
 install_cfs: cfsd cattach cdetach cmkdir
-	install -m 0755 -c -o root cfsd $(ETCDIR)
-	install -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
+	${BSD_INSTALL} -m 0755 -c -o root cfsd $(ETCDIR)
+	${BSD_INSTALL} -m 0755 -c -o root cattach cdetach cmkdir cpasswd cfssh \
                 cname ccat cmkkey $(BINDIR)
-#	install -m 0755 i o $(BINDIR)
+#	${BSD_INSTALL} -m 0755 i o $(BINDIR)
 	@echo "Kill any running cfsd prior to restarting."
 	@echo "See the README file for more information."
 	@echo "Don't forget to install the man pages (*.[18])."