From b498d4bd9357b41ade9bb7efff6dffa93784347a Mon Sep 17 00:00:00 2001 From: "Thomas B. Ruecker" Date: Sat, 13 Dec 2014 19:10:20 +0000 Subject: [PATCH] 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. --- doc/assets/css/Makefile.am | 6 +++--- doc/assets/font/Makefile.am | 6 +++--- doc/assets/img/Makefile.am | 6 +++--- doc/img/Makefile.am | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/assets/css/Makefile.am b/doc/assets/css/Makefile.am index c5ecd651..bdd0a822 100644 --- a/doc/assets/css/Makefile.am +++ b/doc/assets/css/Makefile.am @@ -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) diff --git a/doc/assets/font/Makefile.am b/doc/assets/font/Makefile.am index 56bb7c1e..0f6362a7 100644 --- a/doc/assets/font/Makefile.am +++ b/doc/assets/font/Makefile.am @@ -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) diff --git a/doc/assets/img/Makefile.am b/doc/assets/img/Makefile.am index f4c17ee0..145b5f7a 100644 --- a/doc/assets/img/Makefile.am +++ b/doc/assets/img/Makefile.am @@ -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) diff --git a/doc/img/Makefile.am b/doc/img/Makefile.am index 4ca114b1..f612e4d5 100644 --- a/doc/img/Makefile.am +++ b/doc/img/Makefile.am @@ -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)