[libosmo-dsp PATCH 2/5] build: simplify Doxygen output installation

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ò <flameeyes(a)flameeyes.eu> --- Makefile.am | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index de7600d..6b99f58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,12 +31,9 @@ libosmodsp_la_LDFLAGS = -version-info $(LIBVERSION) 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 @@ -45,10 +42,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 -- 1.7.8.6