From c8b45495ec8192202573361c58a7d52434c6106d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 4 Jul 2012 04:15:47 -0700 Subject: build: simplify Doxygen output installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of using a custom pkgdocdir value use the default, and overridable, htmldir. Also make sure that the directory is properly removed at uninstall, to unbreak `make distcheck`. Signed-off-by: Diego Elio Pettenò Signed-off-by: Sylvain Munaut --- Makefile.am | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec16da9..8d6116d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,9 @@ EXTRA_DIST = git-version-gen if HAVE_DOXYGEN -pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION) -doc_htmldir=$(pkgdocdir)/html +html_DATA = $(top_builddir)/doc/html.tar -doc_html_DATA = $(top_builddir)/doc/html.tar - -$(doc_html_DATA): $(top_builddir)/doc/html/index.html +$(html_DATA): $(top_builddir)/doc/html/index.html cd $(top_builddir)/doc && tar cf html.tar html $(top_builddir)/doc/html/index.html: $(SOURCES) Doxyfile @@ -31,10 +28,10 @@ $(top_builddir)/doc/html/index.html: $(SOURCES) Doxyfile $(DOXYGEN) Doxyfile install-data-hook: - cd $(DESTDIR)$(doc_htmldir) && tar xf html.tar --strip-components 1 && rm -f html.tar + cd $(DESTDIR)$(htmldir) && tar xf html.tar --strip-components 1 && rm -f html.tar uninstall-hook: - cd $(DESTDIR) && rm -rf $(doc_htmldir) + rm -rf $(DESTDIR)$(htmldir) DX_CLEAN = doc/{html,latex}/* doc/html.tar -- cgit v1.2.3