diff options
author | David Seifert <soap@gentoo.org> | 2017-01-13 18:42:30 +0100 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-01-15 13:15:53 +1100 |
commit | 052cd4b6e38c663a5c51c75b0e9d3f01c7b5fef4 (patch) | |
tree | 2ffbbe4f05c7b7847e84e080301a025b6dd9bb2e /doc | |
parent | ce6ab95db39d5bcd953c33d422f44675dac6ec39 (diff) | |
download | flac-052cd4b6e38c663a5c51c75b0e9d3f01c7b5fef4.tar.gz |
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>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | doc/html/Makefile.am | 12 | ||||
-rw-r--r-- | doc/html/images/Makefile.am | 6 |
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) |