From f90fb78ba08347fc1c03d7f172ad91f8c49fbeb5 Mon Sep 17 00:00:00 2001 From: "Thomas B. Ruecker" Date: Tue, 30 Dec 2014 12:56:09 +0000 Subject: [PATCH] Define webdir and admindir in each file for now --- admin/includes/Makefile.am | 1 + web/Makefile.am | 4 +++- web/assets/css/Makefile.am | 1 + web/assets/font/Makefile.am | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/includes/Makefile.am b/admin/includes/Makefile.am index 5d2058db..14f130e6 100644 --- a/admin/includes/Makefile.am +++ b/admin/includes/Makefile.am @@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign +admindir = $(pkgdatadir)/admin otheradmindir = $(admindir)/includes otheradmin_DATA = footer.xsl head.xsl header.xsl mountnav.xsl diff --git a/web/Makefile.am b/web/Makefile.am index 5ab1ff96..1676058d 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = assets webdir = $(pkgdatadir)/web -dist_web_DATA = status.xsl \ +web_DATA = status.xsl \ favicon.ico \ icecast.png \ style.css \ @@ -15,3 +15,5 @@ dist_web_DATA = status.xsl \ key.png \ status-json.xsl \ xml2json.xslt + +EXTRA_DIST = $(web_DATA) diff --git a/web/assets/css/Makefile.am b/web/assets/css/Makefile.am index 49e6b772..7a27aaa8 100644 --- a/web/assets/css/Makefile.am +++ b/web/assets/css/Makefile.am @@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign +webdir = $(pkgdatadir)/web otherwebdir = $(webdir)/assets/css otherweb_DATA = style.css diff --git a/web/assets/font/Makefile.am b/web/assets/font/Makefile.am index af81892f..57bda1ee 100644 --- a/web/assets/font/Makefile.am +++ b/web/assets/font/Makefile.am @@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign +webdir = $(pkgdatadir)/web otherwebdir = $(webdir)/assets/font otherweb_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \