From 200710e3eb9617897be2698077cf77909603f245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 29 Jun 2012 13:01:26 -0700 Subject: build: use default htmldir directory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Diego Elio Pettenò --- Makefile.am | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d135e7ff..d0fb027a 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/core/html/index.html \ +$(html_DATA): $(top_builddir)/doc/core/html/index.html \ $(top_builddir)/doc/gsm/html/index.html \ $(top_builddir)/doc/vty/html/index.html \ $(top_builddir)/doc/codec/html/index.html @@ -49,10 +46,10 @@ $(top_builddir)/doc/codec/html/index.html: $(SOURCES) Doxyfile.codec $(DOXYGEN) Doxyfile.codec install-data-hook: - cd $(DESTDIR)$(doc_htmldir) && tar xf html.tar && rm -f html.tar + cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar uninstall-hook: - cd $(DESTDIR)$(doc_htmldir) && rm -rf {core,gsm,vty,codec} + cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec} DX_CLEAN = doc/{core,gsm,vty,codec}/{html,latex}/* doc/html.tar endif -- cgit v1.2.3