--- doc/Makefile.in.orig	Tue Jul 24 03:09:37 2001
+++ doc/Makefile.in	Fri Nov 23 02:15:32 2001
@@ -128,7 +128,7 @@
 xpet_LDFLAGS = @xpet_LDFLAGS@
 xvic_LDFLAGS = @xvic_LDFLAGS@
 
-docdir = $(prefix)/lib/vice/doc
+docdir = $(prefix)/share/doc/vice
 
 doc_DATA =  	64doc.txt 	Evaluation 	PETdoc.txt 	Readme.beos 	Readme.dos 	Win32-Howto.txt 	cbm_basic_tokens.txt 	drive_info.txt 	mon.txt 	serial.txt
 
@@ -176,7 +176,7 @@
 .texi.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
 	TEXINPUTS=.:$$TEXINPUTS \
