commit 200710e3eb9617897be2698077cf77909603f245
author Diego Elio Pettenò <flameeyes@flameeyes.eu> Fri Jun 29 13:01:26 2012 -0700
committer Harald Welte <laforge@gnumonks.org> Sat Jun 30 22:01:43 2012 +0200
tree 7cb20ba92e66790051902418b12f56500c767e3c
parent 7e007e0f87c4a06396ef46081ef1d69a4bdc11ae

build: use default htmldir directory.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d135e7f..d0fb027 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,12 +17,9 @@
 
 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 @@
 	$(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