Displaying 2 results from an estimated 2 matches for "ef4a12d8".
2017 Jan 13
0
[PATCH 3/4] Honor user's $(htmldir) and do not override GNU defaults for $(docdir)
...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..ef4a12d8 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 \
@@ -46,10 +44,10 @@ if FLaC__HAS_DOXYGEN
# The insta...
2017 Jan 13
9
Upstreaming Gentoo patches
Dear FLAC devs,
I would like to get some of our patches merged into master. Most
of them deal with adhering to GNU conventions, respectively not
overriding flags/variables that are up to the user to set. For instance,
honoring $(htmldir) is important, as we have installation paths for the
documentation that differ from what is currently coded in the various
Makefile.am's.
Regards
David