diff -ur gwave-code-249-trunk.orig/doc/Makefile.am gwave-code-249-trunk/doc/Makefile.am
--- gwave-code-249-trunk.orig/doc/Makefile.am	2003-12-24 13:42:48.000000000 -0700
+++ gwave-code-249-trunk/doc/Makefile.am	2016-08-17 13:11:07.142818075 -0600
@@ -18,7 +18,7 @@
 
 # Make the reference-document textfiles
 gwave-procedures.txt gwave-variables.txt gwave-hooks.txt gwave-concepts.txt:
-	@GUILE@ -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
+	guile -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
 
 html: gwave.sgml
 	mkdir -p html && cd html && \
@@ -39,7 +39,7 @@
 SUFFIXES=.sgml .1 .5
 
 .sgml.1:
-	docbook-to-man $*.sgml > $@
+	docbook2man $*.sgml
 
 .PHONY: html tex dvi ps pdf
 
diff -ur gwave-code-249-trunk.orig/utilities/doc-split.in gwave-code-249-trunk/utilities/doc-split.in
--- gwave-code-249-trunk.orig/utilities/doc-split.in	2008-01-22 20:52:08.000000000 -0700
+++ gwave-code-249-trunk/utilities/doc-split.in	2016-08-17 13:13:59.944653789 -0600
@@ -100,13 +100,13 @@
 	    (if (not (eof-object? line))
 		(begin
 		  (cond 
-		   ((regexp-exec #+"^Concept: " line)
+		   ((regexp-exec (make-regexp "^Concept: ") line)
 		    (set! fp concept-fp))
-		   ((regexp-exec #+"^Hook: " line)
+		   ((regexp-exec (make-regexp "^Hook: ") line)
 		    (set! fp hook-fp))
-		   ((regexp-exec #+"^Variable: " line)
+		   ((regexp-exec (make-regexp "^Variable: ") line)
 		    (set! fp var-fp))
-		   ((regexp-exec #+"^Procedure: " line)
+		   ((regexp-exec (make-regexp "^Procedure: ") line)
 		    (set! fp proc-fp))
 		   (else
 		    (set! fp #f)))