mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-17 18:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next

Browse Source
This commit is contained in:
[CST] Focus
2013-01-29 14:25:08 +04:00
parent 5f105f2ee3 34187b12cd
commit 8763ab3fe0
20 changed files with 79 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
acinclude.m4
View File

@@ -11,7 +11,7 @@ AC_ARG_WITH(target,
AC_ARG_WITH(targetprefix, AC_ARG_WITH(targetprefix,
[ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)], [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)],
[targetprefix="$withval"],[targetprefix="NONE"]) [TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"])
AC_ARG_WITH(debug, AC_ARG_WITH(debug,
[ --without-debug disable debugging code], [ --without-debug disable debugging code],
@@ -21,6 +21,7 @@ if test "$DEBUG" = "yes"; then
DEBUG_CFLAGS="-g3 -ggdb" DEBUG_CFLAGS="-g3 -ggdb"
AC_DEFINE(DEBUG,1,[Enable debug messages]) AC_DEFINE(DEBUG,1,[Enable debug messages])
fi fi
AC_ARG_ENABLE(tmsdk, AC_ARG_ENABLE(tmsdk,
AS_HELP_STRING(--enable-tmsdk, compile inside sdk), AS_HELP_STRING(--enable-tmsdk, compile inside sdk),
,[enable_tmsdk=no]) ,[enable_tmsdk=no])
@@ -38,7 +39,7 @@ if test "$TARGET" = "native"; then
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
prefix=/usr/local prefix=/usr/local
fi fi
targetprefix=$prefix TARGET_PREFIX=$prefix
elif test "$TARGET" = "cdk"; then elif test "$TARGET" = "cdk"; then
AC_MSG_RESULT(cdk) AC_MSG_RESULT(cdk)
@@ -50,13 +51,14 @@ elif test "$TARGET" = "cdk"; then
CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS" CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
fi fi
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode) AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
fi fi
if test "$targetprefix" != "NONE"; then if test "$TARGET_PREFIX" != "NONE"; then
AC_DEFINE_UNQUOTED(TARGETPREFIX, "${targetprefix}",[The targets prefix]) AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
fi fi
if test "$targetprefix" = "NONE"; then if test "$TARGET_PREFIX" = "NONE"; then
targetprefix="" AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
TARGET_PREFIX=""
fi fi
if test "$host_alias" = ""; then if test "$host_alias" = ""; then
cross_compiling=yes cross_compiling=yes
@@ -80,7 +82,7 @@ AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[ AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
_$2=$withval _$2=$withval
if test "$TARGET" = "cdk"; then if test "$TARGET" = "cdk"; then
$2=`eval echo "${targetprefix}$withval"` $2=`eval echo "$TARGET_PREFIX$withval"`
else else
$2=$withval $2=$withval
fi fi
@@ -95,7 +97,6 @@ AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
TARGET_$2=$_$2 TARGET_$2=$_$2
]) ])
dnl automake <= 1.6 don't support this
dnl AC_SUBST($2) dnl AC_SUBST($2)
AC_DEFINE_UNQUOTED($2,"$_$2",$7) AC_DEFINE_UNQUOTED($2,"$_$2",$7)
AC_SUBST(TARGET_$2) AC_SUBST(TARGET_$2)
@@ -109,10 +110,10 @@ if test "$TARGET" = "cdk"; then
sysconfdir="\${prefix}/etc" sysconfdir="\${prefix}/etc"
localstatedir="\${prefix}/var" localstatedir="\${prefix}/var"
libdir="\${prefix}/lib" libdir="\${prefix}/lib"
targetdatadir="\${targetprefix}/share" targetdatadir="\${TARGET_PREFIX}/share"
targetsysconfdir="\${targetprefix}/etc" targetsysconfdir="\${TARGET_PREFIX}/etc"
targetlocalstatedir="\${targetprefix}/var" targetlocalstatedir="\${TARGET_PREFIX}/var"
targetlibdir="\${targetprefix}/lib" targetlibdir="\${TARGET_PREFIX}/lib"
fi fi
TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config, TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
@@ -136,8 +137,17 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
TUXBOX_APPS_DIRECTORY_ONE(ucodedir,UCODEDIR,localstatedir,/var,/tuxbox/ucodes, TUXBOX_APPS_DIRECTORY_ONE(ucodedir,UCODEDIR,localstatedir,/var,/tuxbox/ucodes,
[--with-ucodedir=PATH ],[where to find the ucodes]) [--with-ucodedir=PATH ],[where to find the ucodes])
TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share,/tuxbox/neutrino/themes, TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share/tuxbox, /neutrino/themes,
[--with-themesdir=PATH ],[where to find the themes (don't change)]) [--with-themesdir=PATH ],[where to find the themes (don't change)])
TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share/tuxbox, /neutrino/icons,
[--with-iconssdir=PATH ],[where to find the icons (don't change)])
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])
TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
[--with-public_httpddir=PATH ],[where to find the the public httpd files])
]) ])
dnl automake <= 1.6 needs this specifications dnl automake <= 1.6 needs this specifications
@@ -149,6 +159,9 @@ AC_SUBST(LIBDIR)
AC_SUBST(PLUGINDIR) AC_SUBST(PLUGINDIR)
AC_SUBST(UCODEDIR) AC_SUBST(UCODEDIR)
AC_SUBST(THEMESDIR) AC_SUBST(THEMESDIR)
AC_SUBST(ICONSDIR)
AC_SUBST(PRIVATE_HTTPDDIR)
AC_SUBST(PUBLIC_HTTPDDIR)
dnl end workaround dnl end workaround
AC_DEFUN([TUXBOX_APPS_ENDIAN],[ AC_DEFUN([TUXBOX_APPS_ENDIAN],[
@@ -231,8 +244,8 @@ if test "$$1_CONFIG" != "no"; then
$1_CFLAGS=$($$1_CONFIG --cflags) $1_CFLAGS=$($$1_CONFIG --cflags)
$1_LIBS=$($$1_CONFIG --libs) $1_LIBS=$($$1_CONFIG --libs)
else else
$1_CFLAGS=$($$1_CONFIG --prefix=$targetprefix --cflags) $1_CFLAGS=$($$1_CONFIG --prefix=$TARGET_PREFIX --cflags)
$1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs) $1_LIBS=$($$1_CONFIG --prefix=$TARGET_PREFIX --libs)
fi fi
fi fi
fi fi

8
configure.ac
View File

@@ -122,15 +122,22 @@ AC_ARG_ENABLE(cleanup,
[ --enable-cleanup enable cleanup on exit], [ --enable-cleanup enable cleanup on exit],
[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])]) [AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
if test "$BOXTYPE" = "coolstream"; then
if test "$BOXMODEL" = "nevis"; then
if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
fi fi
fi
if test "$BOXMODEL" = "apollo"; then
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
fi fi
if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
fi fi
fi
fi
# #
# Check for libtdservicedb - the new one - for testing only # Check for libtdservicedb - the new one - for testing only
@@ -179,6 +186,7 @@ src/nhttpd/tuxboxapi/Makefile
src/nhttpd/tuxboxapi/coolstream/Makefile src/nhttpd/tuxboxapi/coolstream/Makefile
src/nhttpd/yhttpd_core/Makefile src/nhttpd/yhttpd_core/Makefile
src/nhttpd/yhttpd_mods/Makefile src/nhttpd/yhttpd_mods/Makefile
src/nhttpd/nhttpd.conf
src/Makefile src/Makefile
src/daemonc/Makefile src/daemonc/Makefile
src/driver/pictureviewer/Makefile src/driver/pictureviewer/Makefile

2
src/driver/framebuffer.cpp
View File

@@ -1569,7 +1569,7 @@ void CFrameBuffer::Clear()
//never used //never used
void CFrameBuffer::showFrame(const std::string & filename) void CFrameBuffer::showFrame(const std::string & filename)
{ {
std::string varpath = "/var/tuxbox/config/neutrino/icons/"; std::string varpath = CONFIGDIR "/neutrino/icons/";
if(!access((varpath + filename).c_str(), F_OK)) if(!access((varpath + filename).c_str(), F_OK))
videoDecoder->ShowPicture((varpath + filename).c_str()); videoDecoder->ShowPicture((varpath + filename).c_str());
else else

6
src/eitd/SIlanguage.cpp
View File

@@ -22,6 +22,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
@@ -32,7 +36,7 @@
#include "SIlanguage.hpp" #include "SIlanguage.hpp"
#define LANGUAGEFILE "/var/tuxbox/config/epglanguages.conf" static const char LANGUAGEFILE[] = CONFIGDIR "/epglanguages.conf";
std::vector<std::string> SIlanguage::languages; std::vector<std::string> SIlanguage::languages;
pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER;

2
src/eitd/SIlanguage.hpp
View File

@@ -29,8 +29,6 @@
#include <sectionsdclient/sectionsdclient.h> #include <sectionsdclient/sectionsdclient.h>
#define LANGUAGEFILE "/var/tuxbox/config/epglanguages.conf"
class SIlanguage { class SIlanguage {
public: public:
static void filter(const std::map<std::string, std::string>& s, int max, std::string& retval); static void filter(const std::map<std::string, std::string>& s, int max, std::string& retval);

2
src/eitd/edvbstring.cpp
View File

@@ -17,7 +17,7 @@ std::set<int> TransponderUseTwoCharMapping;
int readEncodingFile() int readEncodingFile()
{ {
FILE *f = fopen("/var/tuxbox/config/encoding.conf", "rt"); FILE *f = fopen(CONFIGDIR "/encoding.conf", "rt");
if (f) { if (f) {
CountryCodeDefaultMapping.clear(); CountryCodeDefaultMapping.clear();
TransponderDefaultMapping.clear(); TransponderDefaultMapping.clear();

4
src/eitd/sectionsd.cpp
View File

@@ -92,7 +92,7 @@ static bool messaging_zap_detected = false;
/*static*/ bool dvb_time_update = false; /*static*/ bool dvb_time_update = false;
//NTP-Config //NTP-Config
#define CONF_FILE "/var/tuxbox/config/neutrino.conf" #define CONF_FILE CONFIGDIR "/neutrino.conf"
#ifdef USE_BB_NTPD #ifdef USE_BB_NTPD
const std::string ntp_system_cmd_prefix = "/sbin/ntpd -q -p "; const std::string ntp_system_cmd_prefix = "/sbin/ntpd -q -p ";
@@ -1629,7 +1629,7 @@ void CEitThread::beforeSleep()
messaging_zap_detected = false; messaging_zap_detected = false;
unlockMessaging(); unlockMessaging();
if(notify_complete) if(notify_complete)
system("/var/tuxbox/config/epgdone.sh"); system(CONFIGDIR "/epgdone.sh");
} }
/********************************************************************************/ /********************************************************************************/

4
src/eitd/xmlutil.cpp
View File

@@ -47,8 +47,8 @@ extern bool reader_ready;
extern pthread_rwlock_t eventsLock; extern pthread_rwlock_t eventsLock;
extern bool dvb_time_update; extern bool dvb_time_update;
std::string epg_filter_dir = "/var/tuxbox/config/zapit/epgfilter.xml"; std::string epg_filter_dir = CONFIGDIR "/zapit/epgfilter.xml";
std::string dvbtime_filter_dir = "/var/tuxbox/config/zapit/dvbtimefilter.xml"; std::string dvbtime_filter_dir = CONFIGDIR "/zapit/dvbtimefilter.xml";
bool epg_filter_is_whitelist = false; bool epg_filter_is_whitelist = false;
bool epg_filter_except_current_next = false; bool epg_filter_except_current_next = false;

2
src/gui/keybind_setup.cpp
View File

@@ -91,7 +91,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
CFileFilter fileFilter; CFileFilter fileFilter;
fileFilter.addFilter("conf"); fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec("/var/tuxbox/config") == true) { if (fileBrowser.exec(CONFIGDIR "") == true) {
CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str()); CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str());
printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str()); printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str());
} }

2
src/gui/osdlang_setup.cpp
View File

@@ -163,7 +163,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup)
struct dirent **namelist; struct dirent **namelist;
int n; int n;
// printf("scanning locale dir now....(perhaps)\n"); // printf("scanning locale dir now....(perhaps)\n");
char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) "/var/tuxbox/config/locale"}; char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) CONFIGDIR "/locale"};
osdl_setup->addIntroItems(); osdl_setup->addIntroItems();

2
src/gui/settings_manager.cpp
View File

@@ -71,7 +71,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
fileFilter.addFilter("conf"); fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec("/var/tuxbox/config") == true) if (fileBrowser.exec(CONFIGDIR "") == true)
{ {
CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str()); CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str());
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier; CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier;

2
src/gui/start_wizard.cpp
View File

@@ -101,7 +101,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
} }
bool init_settings = false; bool init_settings = false;
if (CFEManager::getInstance()->haveSat()) if (CFEManager::getInstance()->haveSat())
init_settings = file_exists("/var/tuxbox/config/initial/"); init_settings = file_exists(CONFIGDIR "/initial/");
if(init_settings && (res != menu_return::RETURN_EXIT_ALL)) if(init_settings && (res != menu_return::RETURN_EXIT_ALL))
{ {

5
src/nhttpd/Makefile.am
View File

@@ -18,5 +18,10 @@ INCLUDES = \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@
noinst_LIBRARIES = libnhttpd.a noinst_LIBRARIES = libnhttpd.a
libnhttpd_a_SOURCES = yhttpd.cpp libnhttpd_a_SOURCES = yhttpd.cpp
libnhttpd_adir = @CONFIGDIR@
libnhttpd_a_DATA = nhttpd.conf
EXTRA_DIST = nhttpd.conf nhttpd.conf.in

10
src/nhttpd/nhttpd.conf → src/nhttpd/nhttpd.conf.in
View File

@@ -1,8 +1,8 @@
Language.directory=languages Language.directory=languages
Language.selected=Deutsch Language.selected=English
Tuxbox.LogosURL=/usr/share/tuxbox/neutrino/icons/logo Tuxbox.LogosURL=@TARGET_ICONSDIR@/logo
WebsiteMain.directory=/share/tuxbox/neutrino/httpd WebsiteMain.directory=@TARGET_PRIVATE_HTTPDDIR@
WebsiteMain.override_directory=/var/httpd WebsiteMain.override_directory=@TARGET_PUBLIC_HTTPDDIR@
WebsiteMain.port=80 WebsiteMain.port=80
WebsiteMain.hosted_directory=/var/hosted WebsiteMain.hosted_directory=/var/hosted
configfile.version=4 configfile.version=4
@@ -13,7 +13,7 @@ mod_auth.username=root
mod_cache.cache_directory=/tmp/.cache mod_cache.cache_directory=/tmp/.cache
mod_sendfile.mime_types=htm:text/html,html:text/html,xml:text/xml,txt:text/plain,jpg:image/jpeg,jpeg:image/jpeg,gif:image/gif,png:image/png,bmp:image/bmp,css:text/css,js:text/plain,img:application/octet-stream,ico:image/x-icon,m3u:application/octet-stream,tar:application/octet-stream,gz:text/x-gzip,ts:application/octet-stream mod_sendfile.mime_types=htm:text/html,html:text/html,xml:text/xml,txt:text/plain,jpg:image/jpeg,jpeg:image/jpeg,gif:image/gif,png:image/png,bmp:image/bmp,css:text/css,js:text/plain,img:application/octet-stream,ico:image/x-icon,m3u:application/octet-stream,tar:application/octet-stream,gz:text/x-gzip,ts:application/octet-stream
mod_weblog.log_format= mod_weblog.log_format=
mod_weblog.logfile=/tmp/yhhtpd.log mod_weblog.logfile=/tmp/yhttpd.log
server.chroot= server.chroot=
server.group_name= server.group_name=
server.log.loglevel=0 server.log.loglevel=0

4
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -514,14 +514,14 @@ void CControlAPI::GetTimeCGI(CyhookHandler *hh)
// send services.xml // send services.xml
void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh) void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh)
{ {
hh->SendFile("/var/tuxbox/config/zapit/services.xml"); hh->SendFile(CONFIGDIR "/zapit/services.xml");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// send bouquets.xml // send bouquets.xml
void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh) void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh)
{ {
hh->SendFile("/var/tuxbox/config/zapit/bouquets.xml"); hh->SendFile(CONFIGDIR "/zapit/bouquets.xml");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
src/nhttpd/tuxboxapi/dbox/controlapi.cpp
View File

@@ -524,14 +524,14 @@ void CControlAPI::SettingsCGI(CyhookHandler *hh)
// send services.xml // send services.xml
void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh) void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh)
{ {
hh->SendFile("/var/tuxbox/config/zapit/services.xml"); hh->SendFile(CONFIGDIR "/zapit/services.xml");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// send bouquets.xml // send bouquets.xml
void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh) void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh)
{ {
hh->SendFile("/var/tuxbox/config/zapit/bouquets.xml"); hh->SendFile(CONFIGDIR "/zapit/bouquets.xml");
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

21
src/nhttpd/yconfig.h
View File

@@ -7,6 +7,9 @@
#ifndef __yconfig_h__ #ifndef __yconfig_h__
#define __yconfig_h__ #define __yconfig_h__
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
// c++ // c++
#include <string> #include <string>
#include <map> #include <map>
@@ -101,30 +104,26 @@
#define HTTPD_DEFAULT_LANGUAGE "English" #define HTTPD_DEFAULT_LANGUAGE "English"
#define AUTHUSER "root" #define AUTHUSER "root"
#ifndef TARGETPREFIX #define HTTPD_CONFIGDIR CONFIGDIR
#define TARGETPREFIX ""
#endif
#define HTTPD_CONFIGDIR TARGETPREFIX"/var/tuxbox/config"
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf" #define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf" #define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf"
#define PUBLICDOCUMENTROOT TARGETPREFIX"/var/httpd" #define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR
#define NEUTRINO_CONFIGFILE TARGETPREFIX"/var/tuxbox/config/neutrino.conf" #define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf"
#define HOSTEDDOCUMENTROOT "/mnt/hosted" #define HOSTEDDOCUMENTROOT "/mnt/hosted"
#define EXTRASDOCUMENTROOT "/mnt/hosted/extras" #define EXTRASDOCUMENTROOT "/mnt/hosted/extras"
#define EXTRASDOCUMENTURL "/hosted/extras" #define EXTRASDOCUMENTURL "/hosted/extras"
#define ZAPITXMLPATH TARGETPREFIX"/var/tuxbox/config/zapit" #define ZAPITXMLPATH CONFIGDIR"/zapit"
#define TUXBOX_LOGOS_URL TARGETPREFIX"/usr/share/neutrino/icons/logos" #define TUXBOX_LOGOS_URL ICONSDIR"/logo"
// switch for Box differences // switch for Box differences
#ifdef CONFIG_SYSTEM_TUXBOX #ifdef CONFIG_SYSTEM_TUXBOX
#define AUTHPASSWORD "dbox2" #define AUTHPASSWORD "dbox2"
#define PRIVATEDOCUMENTROOT TARGETPREFIX"/share/tuxbox/neutrino/httpd-y" #define PRIVATEDOCUMENTROOT DATADIR"/httpd-y"
#endif #endif
#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM #ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM
#define AUTHPASSWORD "coolstream" #define AUTHPASSWORD "coolstream"
#define PRIVATEDOCUMENTROOT TARGETPREFIX"/share/tuxbox/neutrino/httpd" #define PRIVATEDOCUMENTROOT PRIVATE_HTTPDDIR
#undef Y_CONFIG_BUILD_AS_DAEMON // No Daemon #undef Y_CONFIG_BUILD_AS_DAEMON // No Daemon
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

1
src/nhttpd/yhttpd_core/Makefile.am
View File

@@ -1,5 +1,6 @@
INCLUDES = \ INCLUDES = \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

1
src/nhttpd/yhttpd_mods/Makefile.am
View File

@@ -1,4 +1,5 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

2
src/system/localize.cpp
View File

@@ -111,7 +111,7 @@ CLocaleManager::~CLocaleManager()
delete[] defaultData; delete[] defaultData;
} }
const char * path[2] = {"/var/tuxbox/config/locale/", DATADIR "/neutrino/locale/"}; const char * path[2] = {CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"};
CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault) CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault)
{ {