From e8e806fd8e522b8c89c29b4571a6c507e4a047ab Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Sep 2017 22:30:34 +0200 Subject: [PATCH] define FLAGDIR in acinclude.m4 otherwise it won't work on PC Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ee02df65499b16e1ecda65afbb51acef0e97b279 Author: vanhofen Date: 2017-09-12 (Tue, 12 Sep 2017) Origin message was: ------------------ - define FLAGDIR in acinclude.m4 otherwise it won't work on PC --- acinclude.m4 | 4 ++++ src/global.h | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4df1f9754..4411f17de 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -204,6 +204,9 @@ TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/ht TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted, [--with-hosted_httpddir=PATH ],[where to find the the hosted files]) + +TUXBOX_APPS_DIRECTORY_ONE(flagdir,FLAGDIR,localstatedir,/var,/etc, + [--with-flagdir=PATH ],[where to find the the flagfiles]) ]) dnl automake <= 1.6 needs this specifications @@ -229,6 +232,7 @@ AC_SUBST(ICONSDIR_VAR) AC_SUBST(PRIVATE_HTTPDDIR) AC_SUBST(PUBLIC_HTTPDDIR) AC_SUBST(HOSTED_HTTPDDIR) +AC_SUBST(FLAGDIR) dnl end workaround AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[ diff --git a/src/global.h b/src/global.h index fadfa39cf..b7f06daaf 100644 --- a/src/global.h +++ b/src/global.h @@ -53,8 +53,6 @@ #define LOGODIR ICONSDIR "/logo" #define LOGODIR_VAR ICONSDIR_VAR "/logo" -#define FLAGDIR "/var/etc" //NI - NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SglobalInfo g_info;