Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am	(revision 18905)
+++ doc/Makefile.am	(working copy)
@@ -2,8 +2,6 @@
 
 SUBDIRS = libvorbis vorbisfile vorbisenc
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
 ### all of the static docs, commited to SVN and included as is
 static_docs = \
 	rfc5215.xml \
Index: doc/libvorbis/Makefile.am
===================================================================
--- doc/libvorbis/Makefile.am	(revision 18905)
+++ doc/libvorbis/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis
+docdir = @docdir@/libvorbis
 
 doc_DATA = index.html reference.html style.css vorbis_comment.html\
   vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\
Index: doc/vorbisenc/Makefile.am
===================================================================
--- doc/vorbisenc/Makefile.am	(revision 18905)
+++ doc/vorbisenc/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
+docdir = @docdir@/vorbisenc
 
 doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \
 	ovectl_ratemanage_arg.html overview.html reference.html style.css\
Index: doc/vorbisfile/Makefile.am
===================================================================
--- doc/vorbisfile/Makefile.am	(revision 18905)
+++ doc/vorbisfile/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
+docdir = @docdir@/vorbisfile
 
 doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
 	chainingexample.html crosslap.html datastructures.html decoding.html\