From 503a12f862f7af8c9f715d1cc01d06476dde08a1 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 6 Aug 2009 19:03:26 +0000
Subject: [PATCH] Clean up doc handling.

---
 Makefile.am     | 4 ----
 doc/Makefile.am | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 04687d3..c3c55a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,6 @@ else
 all-local: $(GENFILES)
 endif
 
-install-data-hook:
-	rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-	cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
-
 $(GENFILES): %: %.in Makefile
 	rm -f $@.tmp
 	sed < $@.in > $@.tmp \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 25d6f2d..f40c98f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgdocdir = $(datadir)/doc/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
+
+install-data-hook:
+    rm -rf $(DESTDIR)$(pkgdocdir)/api
+    cp -r doc/api $(DESTDIR)$(pkgdocdir)
+    rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
 
 docfiles = \
     README.txt \
-- 
2.1.4