Commit 052cd4b6 authored by David Seifert's avatar David Seifert Committed by Erik de Castro Lopo

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: default avatarErik de Castro Lopo <erikd@mega-nerd.com>
parent ce6ab95d
......@@ -31,8 +31,6 @@ FLAC.tag:
mkdir -p html/api
endif
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
doc_DATA = \
FLAC.tag
......
......@@ -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
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment