From: Scott Cantor Date: Thu, 6 Aug 2009 19:03:26 +0000 (+0000) Subject: Clean up doc handling. X-Git-Tag: 1.2.1~13 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=503a12f862f7af8c9f715d1cc01d06476dde08a1 Clean up doc handling. --- 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 \