From a5e1f75d7eb94efdb2567610e9e80b60c9f80f13 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 4 Jul 2021 21:41:35 +0200 Subject: [PATCH] - acinclude: add possibility to define logodir Signed-off-by: Thilo Graf --- acinclude.m4 | 8 ++++++++ src/global.h | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index db611f8ea..54c91b85d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -337,6 +337,12 @@ TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbo TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons, [--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var]) +TUXBOX_APPS_DIRECTORY_ONE(logodir, LOGODIR, datadir, /share, /tuxbox/neutrino/icons/logo, + [--with-logodir=PATH], [where to find channel logos]) + +TUXBOX_APPS_DIRECTORY_ONE(logodir_var, LOGODIR_VAR, localstatedir, /var, /tuxbox/icons/logo, + [--with-logodir_var=PATH], [where to find channel logos in /var]) + TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd, [--with-private_httpddir=PATH], [where to find private httpd files]) @@ -377,6 +383,8 @@ AC_SUBST(ICONSDIR) AC_SUBST(ICONSDIR_VAR) AC_SUBST(LCD4L_ICONSDIR) AC_SUBST(LCD4L_ICONSDIR_VAR) +AC_SUBST(LOGODIR) +AC_SUBST(LOGODIR_VAR) AC_SUBST(PRIVATE_HTTPDDIR) AC_SUBST(PUBLIC_HTTPDDIR) AC_SUBST(HOSTED_HTTPDDIR) diff --git a/src/global.h b/src/global.h index 54532fc22..8701401a1 100644 --- a/src/global.h +++ b/src/global.h @@ -51,8 +51,6 @@ #define COVERDIR_TMP "/tmp/.cover" -#define LOGODIR ICONSDIR "/logo" -#define LOGODIR_VAR ICONSDIR_VAR "/logo" #define LOGODIR_TMP "/tmp/.logo" NEUTRINO_CPP SNeutrinoSettings g_settings;