Commit b498d4bd authored by Thomas B. Rücker's avatar Thomas B. Rücker 😊

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.
parent 28572be2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/css otherdocdir = $(docdir)/assets/css
doc_DATA = style.css otherdoc_DATA = style.css
EXTRA_DIST = $(doc_DATA) EXTRA_DIST = $(otherdoc_DATA)
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/font otherdocdir = $(docdir)/assets/font
doc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \ otherdoc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
FiraSans-Bold.eot FiraSans-BoldItalic.woff \ FiraSans-Bold.eot FiraSans-BoldItalic.woff \
FiraSans-Italic.eot FiraSans-Regular.eot \ FiraSans-Italic.eot FiraSans-Regular.eot \
FiraMono-Bold.woff FiraMono-Regular.woff \ FiraMono-Bold.woff FiraMono-Regular.woff \
FiraSans-BoldItalic.eot FiraSans-Bold.woff \ FiraSans-BoldItalic.eot FiraSans-Bold.woff \
FiraSans-Italic.woff FiraSans-Regular.woff FiraSans-Italic.woff FiraSans-Regular.woff
EXTRA_DIST = $(doc_DATA) EXTRA_DIST = $(otherdoc_DATA)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/assets/img otherdocdir = $(docdir)/assets/img
doc_DATA = xiph-community.svg otherdoc_DATA = xiph-community.svg
EXTRA_DIST = $(doc_DATA) EXTRA_DIST = $(otherdoc_DATA)
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/icecast/img otherdocdir = $(docdir)/img
doc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png otherdoc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png
EXTRA_DIST = $(doc_DATA) EXTRA_DIST = $(otherdoc_DATA)
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