File macutils.diff of Package macutils

--- macutils/binhex/binhex.c
+++ macutils/binhex/binhex.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include "../fileio/machdr.h"
 #include "../fileio/rdfile.h"
+#include "../fileio/rdfileopt.h"
 #include "../util/patchlevel.h"
 
 extern char *malloc();
--- macutils/comm/frommac.c
+++ macutils/comm/frommac.c
@@ -5,6 +5,7 @@
 #include "globals.h"
 #include "../fileio/fileglob.h"
 #include "../fileio/wrfile.h"
+#include "../fileio/wrfileopt.h"
 
 #define LOCALOPT	"lmxyzoTVH"
 
--- macutils/comm/tomac.c
+++ macutils/comm/tomac.c
@@ -2,6 +2,7 @@
 #include "comm.h"
 #include "../fileio/machdr.h"
 #include "../fileio/rdfile.h"
+#include "../fileio/rdfileopt.h"
 #include "../util/patchlevel.h"
 #include "globals.h"
 
--- macutils/crc/makefile
+++ macutils/crc/makefile
@@ -16,7 +16,7 @@
 	./makecrc
 
 makecrc:	makecrc.o
-	cc -O -o makecrc makecrc.o
+	$(CC) $(CF) -o makecrc makecrc.o
 
 arc.o:	arc.c
 ccitt.o:	ccitt.c
--- macutils/hexbin/hqx.c
+++ macutils/hexbin/hqx.c
@@ -389,6 +389,7 @@
     for(i = 0; i < n; i++) {
 	*buf++ = getq();
     }
+    return 0;
 }
 #else /* HQX */
 int hqx; /* keep lint and some compilers happy */
--- macutils/makefile
+++ macutils/makefile
@@ -1,5 +1,6 @@
 SHELL =	/bin/sh
-BINDIR =	/ufs/dik/tmpbin
+BINDIR =	$(DESTDIR)/usr/bin
+MANDIR =	$(DESTDIR)/usr/share/man
 # Use the following flags on the CF macro definition as needed.
 #
 # -DBSD if you are on a BSD system
@@ -64,13 +65,14 @@
 	(cd comm; make CF='$(CF)' lint)
 
 install:
-	cp macunpack/macunpack $(BINDIR)/.
-	cp hexbin/hexbin $(BINDIR)/.
-	cp mixed/macsave $(BINDIR)/.
-	cp mixed/macstream $(BINDIR)/.
-	cp binhex/binhex $(BINDIR)/.
-	cp comm/tomac $(BINDIR)/.
-	cp comm/frommac $(BINDIR)/.
+	install -m 0755 macunpack/macunpack $(BINDIR)/.
+	install -m 0755 hexbin/hexbin $(BINDIR)/.
+	install -m 0755 mixed/macsave $(BINDIR)/.
+	install -m 0755 mixed/macstream $(BINDIR)/.
+	install -m 0755 binhex/binhex $(BINDIR)/.
+	install -m 0755 comm/tomac $(BINDIR)/.
+	install -m 0755 comm/frommac $(BINDIR)/.
+	install -m 0644 man/*.1 $(MANDIR)/man1/
 
 distr:
 	shar -a README makefile crc util fileio macunpack hexbin mixed binhex  \