--- doc/Makefile.in.orig	Tue Jul 24 10:27:41 2001
+++ doc/Makefile.in	Mon Aug 27 11:23:33 2001
@@ -99,7 +99,7 @@ YACC = @YACC@
 aclocaldir = @aclocaldir@
 lispdir = @lispdir@
 
-docdir = $(prefix)/doc/@PACKAGE@
+docdir = $(datadir)/doc/@PACKAGE@
 dvidir = $(docdir)
 psdir = $(docdir)
 pdfdir = $(docdir)
@@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 SED = sed
 RM = rm -f
 
-MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
+MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ --no-split
 
 info_TEXINFOS = gettext.texi
 gettext_TEXINFOS = iso-639.texi iso-3166.texi