diff --git a/doc/.gitignore b/doc/.gitignore
index 8991c2e..ed54f73 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -11,6 +11,9 @@
 *.pdf
 *.toc
 
+stamp-vti
 version.texi
 easejs.info
-stamp-vti
+easejs.txt
+easejs.html
+easejs-single.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1fbfd61..3e91f38 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,20 +26,20 @@ impl-details.texi integration.texi mkeywords.texi source-tree.texi
 
 EXTRA_DIST = img README highlight.pack.js interactive.js easejs.css
 
-path_doc=.
 path_build=../build
 path_lib=../lib
 docdir = @docdir@
-path_doc_output=${path_build}/doc
-path_doc_output_plain=${path_doc_output}/easejs.txt
-path_doc_output_html=${path_doc_output}/easejs
-path_doc_output_html1=${path_doc_output}/easejs.html
-path_doc_css=${path_doc}/easejs.css
-path_doc_img=${path_doc}/img
-path_doc_css_ref=easejs.css
-path_easejs_texi=${path_doc}/easejs.texi
+path_doc_output_plain=easejs.txt
+path_doc_output_html=easejs.html
+path_doc_output_html1=easejs-single.html
+path_doc_css=easejs.css
+path_doc_img=img
+path_easejs_texi=easejs.texi
+path_doc_css_ref=$(path_doc_css)
 
-doc_src := $(wildcard $(path_doc)/*.texi)
+MAKEINFOHTML=$(MAKEINFO) --html --css-ref="$(path_doc_css_ref)"
+
+doc_src := $(wildcard *.texi)
 doc_imgs := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.dia))
 doc_imgs_txt := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.txt))
 
@@ -49,55 +49,35 @@ doc_replace := s/<\/body>/<script type="text\/javascript" \
 	;s/\&gt\;=/\&\#8805\;/g\
 	;s/\&lt\;=/\&\#8804\;/g
 
-.PHONY: doc mkbuild-doc img pdf info plain html
-
-# generate texinfo documentation (twice to generate TOC), then remove the extra
-# files that were generated
-#
-# generates: pdf, info, HTML (multiple pages), HTML (single page)
-default: pdf info plain html
+.PHONY: doc mkbuild-doc img info html
 
 mkbuild-doc: $(path_doc_output)
 
-$(path_doc_output):
-	[ -d $(path_doc_output) ] || mkdir -p "$(path_doc_output)"
+dvi-local: img
+pdf-local: img
+html-local: img easejs.css highlight.pack.js interactive.js
 
 # doc images
-$(path_doc)/img/%.png: $(path_doc)/img/%.dia
+img/%.png: img/%.dia
 	echo "$<" | grep -q 'wide' \
 		&& dia -e $@ -s x250 $< \
 		|| dia -e $@ -s 300x $<
 
-# doc pdf
-$(path_doc_output)/%.pdf: $(doc_src) $(doc_imgs) | mkbuild-doc img
-	TEXINPUTS="$(path_doc):" \
-		pdftex -output-directory "${path_doc}" "${path_easejs_texi}" && \
-		TEXINPUTS="$(path_doc):" \
-		pdftex -output-directory "${path_doc}" "${path_easejs_texi}"
-	mv -f "${path_doc}"/*.pdf "${path_doc_output}"
-	cd "$(path_doc)" && rm -f $(shell cat "$(path_doc)/.gitignore")
-
 # doc plain text
-$(path_doc_output_plain): $(doc_imgs_txt) | mkbuild-doc
-	makeinfo --plain -I "$(path_doc)" "${path_easejs_texi}" > $@
+$(path_doc_output_plain): $(doc_imgs_txt)
+	makeinfo --plain -I "." "${path_easejs_texi}" -o "$@"
 
-# doc html (multiple pages)
-$(path_doc_output_html)/index.html: $(doc_src) $(path_doc_css) \
-| $(path_doc_output_html)/img $(path_doc_output_html)/interactive.js \
-$(path_doc_output_html)/highlight.pack.js \
-$(path_doc_output_html)/$(path_doc_css_ref) mkbuild-doc img
-	makeinfo --html --css-ref="$(path_doc_css_ref)" \
-		-I "$(path_doc)" -o "${path_doc_output_html}" "${path_easejs_texi}"
-	sed -i '$(doc_replace)' $(path_doc_output_html)/*.htm?
+# doc html (multiple pages); override default target to call automake's first
+# and then post-process output (it has no *-hook target support)
+html: html-am $(path_doc_output_html)/$(path_doc_css_ref)
+	sed -i '$(doc_replace)' easejs.html/*.htm?
 
 # doc html (single page)
-$(path_doc_output_html1): $(doc_src) $(path_doc_css) \
-| $(path_doc_output)/img $(path_doc_output)/interactive.js \
-$(path_doc_output)/highlight.pack.js mkbuild-doc img
-	makeinfo --no-split --html --css-include="${path_doc_css}" \
-		-I "$(path_doc)" -o - "${path_easejs_texi}" \
-		| sed '$(doc_replace)' \
-			> "$(path_doc_output_html1)"
+html-single: $(path_doc_output_html1)
+$(path_doc_output_html1): html-local
+	$(MAKEINFO) --no-split --html --css-include="${path_doc_css}" \
+		-I "." -o "$(path_doc_output_html1)" "${path_easejs_texi}" \
+		&& sed -i '$(doc_replace)' "$(path_doc_output_html1)"
 
 # doc images (in build dir)
 $(path_doc_output)/img: $(doc_imgs) | mkbuild-doc img
@@ -108,34 +88,24 @@ $(path_doc_output_html)/img: $(path_doc_output)/img
 	ln -s ../img $@
 
 # interactive html doc (js)
-$(path_doc_output_html)/%.js: $(path_doc)/%.js
+$(path_doc_output_html)/%.js: %.js
 	cp $< $@
-$(path_doc_output)/%.js: $(path_doc)/%.js
+$(path_doc_output)/%.js: %.js
 	cp $< $@
 
 # doc css
-$(path_doc_output_html)/%.css: $(path_doc)/%.css
+$(path_doc_output_html)/%.css: %.css
 	cp $< $@
 
 
 img: $(doc_imgs)
-pdf: $(path_doc_output)/easejs.pdf
-install-pdf: pdf
-	install -d $(DESTDIR)$(docdir)
-	install -m644 $(path_doc_output)/easejs.pdf $(DESTDIR)$(docdir)/easejs.pdf
 
 plain: $(path_doc_output_plain)
 install-plain: plain
 	install -d $(DESTDIR)$(docdir)
 	install -m644 $(path_doc_output_plain) $(DESTDIR)$(docdir)/easejs.txt
 
-html: $(path_doc_output_html)/index.html $(path_doc_output_html1)
-install-html: html
-	install -d $(DESTDIR)$(docdir)/easejs
-	install -m644 $(path_doc_output_html)/index.html $(DESTDIR)$(docdir)/easejs/index.html
-	install -m644 $(path_doc_output_html1) $(DESTDIR)$(docdir)/easejs.html
-
-clean:
-	rm -rf $(path_doc_output)
+clean-local:
 	rm -rf $(path_doc_img)/*.png
+	rm -f $(path_doc_output_plain)