mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move definitions for '*_VAR' directories to configure

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 281930c35d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-30 (Fri, 30 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-09-30 05:54:17 +02:00
parent 16b4ae67e6
commit bfe4f08ef7
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
acinclude.m4
View File

@@ -123,43 +123,58 @@ if test "$TARGET" = "cdk"; then
fi
TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
[--with-configdir=PATH ],[where to find the config files])
[--with-configdir=PATH ],[where to find the config files])
TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
[--with-datadir=PATH ],[where to find data])
[--with-datadir=PATH ],[where to find data])
TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
[--with-fontdir=PATH ],[where to find the fonts])
[--with-fontdir=PATH ],[where to find the fonts])
TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
[--with-gamesdir=PATH ],[where games data is stored])
[--with-gamesdir=PATH ],[where games data is stored])
TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
[--with-libdir=PATH ],[where to find the internal libs])
[--with-libdir=PATH ],[where to find the internal libs])
TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
[--with-plugindir=PATH ],[where to find the plugins])
[--with-plugindir=PATH ],[where to find the plugins])
TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
[--with-plugindir_var=PATH ],[where to find the plugins in /var])
TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
[--with-plugindir_mnt=PATH ],[where to find the the extern plugins])
TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
[--with-luaplugindir=PATH ],[where to find Lua plugins])
[--with-luaplugindir=PATH ],[where to find Lua plugins])
TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
[--with-localedir=PATH ],[where to find the locale])
[--with-localedir=PATH ],[where to find the locale])
TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale,
[--with-localedir_var=PATH ],[where to find the locale in /var])
TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
[--with-themesdir=PATH ],[where to find the themes])
[--with-themesdir=PATH ],[where to find the themes])
TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
[--with-themesdir_var=PATH ],[where to find the themes in /var])
TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
[--with-iconsdir=PATH ],[where to find the icons])
[--with-iconsdir=PATH ],[where to find the icons])
TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
[--with-iconsdir_var=PATH ],[where to find the icons in /var])
TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
[--with-private_httpddir=PATH ],[where to find the the private httpd files])
[--with-private_httpddir=PATH ],[where to find the the private httpd files])
TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
[--with-public_httpddir=PATH ],[where to find the the public httpd files])
[--with-public_httpddir=PATH ],[where to find the the public httpd files])
TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
[--with-hosted_httpddir=PATH ],[where to find the the hosted files])
[--with-hosted_httpddir=PATH ],[where to find the the hosted files])
])
dnl automake <= 1.6 needs this specifications

6
src/global.h
View File

@@ -46,12 +46,6 @@
#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked"
#define ICONSDIR_VAR "/var/tuxbox/icons/"
#define LOCALEDIR_VAR "/var/tuxbox/locale"
#define THEMESDIR_VAR "/var/tuxbox/themes"
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins"
#define LOGODIR ICONSDIR "/logo"
#define LOGODIR_VAR ICONSDIR_VAR "/logo"