aniani
/
icecast-server
mirror of https://gitlab.xiph.org/xiph/icecast-server.git
1
0
Fork 0
Code

Fix for docdir issue with deb/RPM. Fixes #2121 

Replaced docdir with otherdocdir and made it relative to docdir.
This seems to work for debian and plain make install.
Will test RPM later.
This commit is contained in:
Thomas B. Ruecker 2014-12-13 19:10:20 +00:00
parent 28572be2ec
commit b498d4bd93
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/assets/css/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/css
doc_DATA = style.css
otherdocdir = $(docdir)/assets/css
otherdoc_DATA = style.css
EXTRA_DIST = $(doc_DATA)
EXTRA_DIST = $(otherdoc_DATA)

6
doc/assets/font/Makefile.am
View File

@ -2,12 +2,12 @@
AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/font
doc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
otherdocdir = $(docdir)/assets/font
otherdoc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
FiraSans-Bold.eot FiraSans-BoldItalic.woff \
FiraSans-Italic.eot FiraSans-Regular.eot \
FiraMono-Bold.woff FiraMono-Regular.woff \
FiraSans-BoldItalic.eot FiraSans-Bold.woff \
FiraSans-Italic.woff FiraSans-Regular.woff
EXTRA_DIST = $(doc_DATA)
EXTRA_DIST = $(otherdoc_DATA)

6
doc/assets/img/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/img
doc_DATA = xiph-community.svg
otherdocdir = $(docdir)/assets/img
otherdoc_DATA = xiph-community.svg
EXTRA_DIST = $(doc_DATA)
EXTRA_DIST = $(otherdoc_DATA)

6
doc/img/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/img
doc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png
otherdocdir = $(docdir)/img
otherdoc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png
EXTRA_DIST = $(doc_DATA)
EXTRA_DIST = $(otherdoc_DATA)