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

neutrino: fix config file locations.

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-11-13 12:45:17 +08:00
parent fe5acac85c
commit 5c5a90ff05
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
acinclude.m4
View File

@@ -48,6 +48,9 @@ elif test "$TARGET" = "cdk"; then
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
AC_DEFINE_UNQUOTED(TARGETPREFIX, "${targetprefix}",[The targets prefix])
fi
if test "$targetprefix" = "NONE"; then if test "$targetprefix" = "NONE"; then
targetprefix="" targetprefix=""
fi fi
@@ -216,18 +219,18 @@ if test "$$1_CONFIG" != "no"; then
if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
AC_MSG_$3([could not find a suitable version of $2]); AC_MSG_$3([could not find a suitable version of $2]);
else else
if test "$1" = "CURL"; then if test "$1" = "CURL"; then
$1_CFLAGS=$($$1_CONFIG --cflags) $1_CFLAGS=$($$1_CONFIG --cflags)
$1_LIBS=$($$1_CONFIG --libs) $1_LIBS=$($$1_CONFIG --libs)
else else
if test "$1" = "FREETYPE"; then if test "$1" = "FREETYPE"; 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=$targetprefix --cflags)
$1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs) $1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs)
fi fi
fi fi
fi fi
fi fi

2
src/gui/bookmarkmanager.h
View File

@@ -43,7 +43,7 @@
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#define MAXBOOKMARKS 10 #define MAXBOOKMARKS 10
#define BOOKMARKFILE "/var/tuxbox/config/bookmarks" #define BOOKMARKFILE CONFIGDIR"/bookmarks"
class CBookmark class CBookmark
{ {

7
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -12,6 +12,10 @@
#include <sys/types.h> //ntohs #include <sys/types.h> //ntohs
#include <netinet/in.h> //ntohs #include <netinet/in.h> //ntohs
#include <inttypes.h> //ntohs #include <inttypes.h> //ntohs
#include <global.h>
#include <neutrino.h>
#include <system/settings.h>
// yhttpd // yhttpd
#include "yhttpd.h" #include "yhttpd.h"
#include "ytypes_globals.h" #include "ytypes_globals.h"
@@ -22,9 +26,6 @@
#include "neutrinoyparser.h" #include "neutrinoyparser.h"
#include "neutrinoapi.h" #include "neutrinoapi.h"
#include <global.h>
#include <neutrino.h>
#include <system/settings.h>
#include <zapit/channel.h> #include <zapit/channel.h>
#include <zapit/zapit.h> #include <zapit/zapit.h>

22
src/nhttpd/yconfig.h
View File

@@ -101,26 +101,30 @@
#define HTTPD_DEFAULT_LANGUAGE "English" #define HTTPD_DEFAULT_LANGUAGE "English"
#define AUTHUSER "root" #define AUTHUSER "root"
#define HTTPD_CONFIGDIR "/var/tuxbox/config" #ifndef TARGETPREFIX
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR "/nhttpd.conf" #define TARGETPREFIX ""
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR "/Y-Web.conf" #endif
#define PUBLICDOCUMENTROOT "/var/httpd"
#define NEUTRINO_CONFIGFILE "/var/tuxbox/config/neutrino.conf" #define HTTPD_CONFIGDIR TARGETPREFIX"/var/tuxbox/config"
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf"
#define PUBLICDOCUMENTROOT TARGETPREFIX"/var/httpd"
#define NEUTRINO_CONFIGFILE TARGETPREFIX"/var/tuxbox/config/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 "/var/tuxbox/config/zapit" #define ZAPITXMLPATH TARGETPREFIX"/var/tuxbox/config/zapit"
#define TUXBOX_LOGOS_URL "/usr/share/tuxbox/neutrino/icons/logos" #define TUXBOX_LOGOS_URL TARGETPREFIX"/usr/share/neutrino/icons/logos"
// switch for Box differences // switch for Box differences
#ifdef CONFIG_SYSTEM_TUXBOX #ifdef CONFIG_SYSTEM_TUXBOX
#define AUTHPASSWORD "dbox2" #define AUTHPASSWORD "dbox2"
#define PRIVATEDOCUMENTROOT "/share/tuxbox/neutrino/httpd-y" #define PRIVATEDOCUMENTROOT TARGETPREFIX"/share/tuxbox/neutrino/httpd-y"
#endif #endif
#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM #ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM
#define AUTHPASSWORD "coolstream" #define AUTHPASSWORD "coolstream"
#define PRIVATEDOCUMENTROOT "/share/tuxbox/neutrino/httpd" #define PRIVATEDOCUMENTROOT TARGETPREFIX"/share/tuxbox/neutrino/httpd"
#undef Y_CONFIG_BUILD_AS_DAEMON // No Daemon #undef Y_CONFIG_BUILD_AS_DAEMON // No Daemon
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

1
src/nhttpd/yhttpd.cpp
View File

@@ -56,6 +56,7 @@ static CmodCache mod_cache; // static instance
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) #if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM)
#include "neutrinoapi.h" #include "neutrinoapi.h"
#include <config.h>
static CNeutrinoAPI *NeutrinoAPI; static CNeutrinoAPI *NeutrinoAPI;
#endif #endif