Clean up doc handling.

diff --git a/Makefile.am b/Makefile.am
index 04687d3..c3c55a9 100644 (file)
--- 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 (file)
--- 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 \