This simplifies the Makefile and uses the overridable htmldir setting
instead.
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 5167991..f5f703d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,12 +33,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
@@ -47,10 +44,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