Commit 21a1a714 authored by Ralph Giles's avatar Ralph Giles
Browse files

autotools: Fix doc_DATA install.

Both the generated format specification document and the static
html documents depend on the logo in fish_xiph_org.png.

Unfortunately we can't list them both in their respective
dependencies because both are passed to doc_DATA for installation
and automake doesn't seem to remove duplicates, causing
/usr/bin/install to complain about the overwrite.

I couldn't find a good solution to this. Wrapping the doc_DATA
value in GNU make's $(sort /list/) function would work, but
automake warns about the non-portable construct. Instead, I've
just removed it from the spec dependency list and appended it
parent b7ef20e0
...@@ -29,7 +29,6 @@ static_docs = \ ...@@ -29,7 +29,6 @@ static_docs = \
# bits needed by the spec # bits needed by the spec
components.png \ components.png \
fish_xiph_org.png \
floor1-1.png \ floor1-1.png \
floor1-2.png \ floor1-2.png \
floor1-3.png \ floor1-3.png \
...@@ -98,7 +97,7 @@ DISTCLEANFILES = $(built_docs) ...@@ -98,7 +97,7 @@ DISTCLEANFILES = $(built_docs)
# explicit rules for generating docs # explicit rules for generating docs
Vorbis_I_spec.html Vorbis_I_spec.css: $(SPEC_TEX) $(SPEC_PNG) Vorbis_I_spec.html Vorbis_I_spec.css: $(SPEC_TEX) $(SPEC_PNG) fish_xiph_org.png
htlatex $< htlatex $<
Vorbis_I_spec.pdf: $(SPEC_TEX) $(SPEC_PNG) Vorbis_I_spec.pdf: $(SPEC_TEX) $(SPEC_PNG)
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