Honor user's $(htmldir) and do not override GNU defaults for $(docdir)

* HTML files should be installed to $(htmldir), and $(docdir) should
  not be changed, as this is a user flag in the GNU conventions.

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>

3 files changed, 8 insertions, 12 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fb79e3a7..bc9ae52a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,8 +31,6 @@ FLAC.tag:
 	mkdir -p html/api
 endif
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
 doc_DATA = \
 	FLAC.tag
 
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 813b55f2..2c73fdbb 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -18,9 +18,7 @@
 
 SUBDIRS = images
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
-
-doc_DATA = \
+html_DATA = \
 	changelog.html \
 	developers.html \
 	documentation.html \
@@ -40,16 +38,16 @@ doc_DATA = \
 	license.html \
 	ogg_mapping.html
 
-EXTRA_DIST = $(doc_DATA) api
+EXTRA_DIST = $(html_DATA) api
 
 if FLaC__HAS_DOXYGEN
 # The install targets don't copy whole directories so we have to
 # handle 'api/' specially:
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
-	(cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
+	$(mkinstalldirs) $(DESTDIR)$(htmldir)/api
+	(cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(htmldir)/api)
 uninstall-local:
-	rm -rf $(DESTDIR)$(docdir)/api
+	rm -rf $(DESTDIR)$(htmldir)/api
 distclean-local:
 	-rm -rf api
 endif
diff --git a/doc/html/images/Makefile.am b/doc/html/images/Makefile.am
index 33485f3a..467651cd 100644
--- a/doc/html/images/Makefile.am
+++ b/doc/html/images/Makefile.am
@@ -16,10 +16,10 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
+logosdir = $(htmldir)/images
 
-doc_DATA = \
+logos_DATA = \
 	logo.svg \
 	logo130.gif
 
-EXTRA_DIST = $(doc_DATA)
+EXTRA_DIST = $(logos_DATA)