--- Makefile.am-dist	2008-08-12 18:44:01.000000000 +0200
+++ Makefile.am	2008-08-12 18:44:26.000000000 +0200
@@ -186,7 +186,7 @@
 		| while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done)
 	(cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \
 		| egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \
-		| while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
+		| while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(docdir)/systemtap/examples/$$f; done)
 
 TEST_COV_DIR = coverage
 
--- stapex.5.in-dist	2008-08-12 18:28:35.000000000 +0200
+++ stapex.5.in	2008-08-12 18:30:12.000000000 +0200
@@ -109,12 +109,12 @@
 .SH MORE EXAMPLES
 
 Larger examples, demos and samples can be found in
-@prefix@/doc/systemtap*/examples, each example comes with either a .txt
+@_docdir@/systemtap*/examples, each example comes with either a .txt
 or .meta file explaining what the example, sample or demo does and how
 it is ordinarily run.
 
 .SH SEE ALSO
-.BR @prefix@/doc/systemtap*/examples
+.BR @_docdir@/systemtap/examples
 .IR stap (1)
 .IR stapprobes (5)
 .IR stapfuncs (5)
--- doc/Makefile.am-dist	2008-08-12 18:31:04.000000000 +0200
+++ doc/Makefile.am	2008-08-12 18:31:17.000000000 +0200
@@ -2,7 +2,7 @@
 ## process this file with automake to produce Makefile.in
 
 PDF_FILES = tutorial.pdf langref.pdf
-DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+DOC_INSTALL_DIR = $(DESTDIR)$(docdir)/systemtap
 
 if BUILD_DOCS
 all-local: $(PDF_FILES)