Skip to content

Commit 21a1a71

Browse files
committed
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 manually.
1 parent b7ef20e commit 21a1a71

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

doc/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ static_docs = \
2929
# bits needed by the spec
3030
SPEC_PNG = \
3131
components.png \
32-
fish_xiph_org.png \
3332
floor1-1.png \
3433
floor1-2.png \
3534
floor1-3.png \
@@ -98,7 +97,7 @@ DISTCLEANFILES = $(built_docs)
9897

9998
# explicit rules for generating docs
10099
if BUILD_DOCS
101-
Vorbis_I_spec.html Vorbis_I_spec.css: $(SPEC_TEX) $(SPEC_PNG)
100+
Vorbis_I_spec.html Vorbis_I_spec.css: $(SPEC_TEX) $(SPEC_PNG) fish_xiph_org.png
102101
htlatex $<
103102

104103
Vorbis_I_spec.pdf: $(SPEC_TEX) $(SPEC_PNG)

0 commit comments

Comments
 (0)