Import heirloom doctools 2016-11-06vendor/heirloom-doctools/20161106vendor/heirloom-doctools

3 files changed, 7 insertions, 3 deletions

diff --git a/eqn/eqn.d/Makefile.mk b/eqn/eqn.d/Makefile.mk
index a02ba2525ef6..f426b86683ee 100644
--- a/eqn/eqn.d/Makefile.mk
+++ b/eqn/eqn.d/Makefile.mk
@@ -8,7 +8,7 @@ FLAGS = -I. -I.. -I../../include $(DEFINES)
 .c.o:
 	$(CC) $(_CFLAGS) $(FLAGS) -c $<
 
-all: eqn
+all: eqn eqnchar.7
 
 eqn: $(OBJ)
 	$(CC) $(_CFLAGS) $(_LDFLAGS) $(OBJ) $(LIBS) -o eqn
@@ -29,10 +29,13 @@ install:
 	$(INSTALL) -c -m 644 eqnchar.7 $(ROOT)$(MANDIR)/man7/eqnchar.7
 
 clean:
-	rm -f $(OBJ) eqn e.c y.tab.* core log *~
+	rm -f $(OBJ) eqn e.c y.tab.* core log *~ eqnchar.7
 
 mrproper: clean
 
+eqnchar.7: eqnchar.7.in
+	sed 's"/usr/pub/"$(ROOT)$(PUBDIR)/"' eqnchar.7.in > $@
+
 diacrit.o: ../diacrit.c ../e.h y.tab.h
 eqnbox.o: ../eqnbox.c ../e.h
 font.o: ../font.c ../e.h
diff --git a/eqn/eqn.d/eqnchar.7 b/eqn/eqn.d/eqnchar.7.in
index b806bc17ba6e..b806bc17ba6e 100644
--- a/eqn/eqn.d/eqnchar.7
+++ b/eqn/eqn.d/eqnchar.7.in
diff --git a/eqn/io.c b/eqn/io.c
index 116267ba14ec..4841dc69f138 100644
--- a/eqn/io.c
+++ b/eqn/io.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <libgen.h>
+#include "global.h"
 
 static char	*in;	/* input buffer */
 static size_t	insize;	/* input buffer size */
@@ -283,7 +284,7 @@ setfile(int argc, char **argv) {
 }
 
 void
-yyerror(char *unused) {;}
+yyerror(char *unused __unused) {;}
 
 void
 init(void) {