neutrino: fix config file locations.

acinclude.m4

@@ -48,6 +48,9 @@ elif test "$TARGET" = "cdk"; then
 	if test "$prefix" = "NONE"; then
 		AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode)
 	fi
+	if test "$targetprefix" != "NONE"; then
+		AC_DEFINE_UNQUOTED(TARGETPREFIX, "${targetprefix}",[The targets prefix])
+	fi
 	if test "$targetprefix" = "NONE"; then
 		targetprefix=""
 	fi

src/gui/bookmarkmanager.h

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

src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp

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

src/nhttpd/yconfig.h

@@ -101,26 +101,30 @@
 #define HTTPD_DEFAULT_LANGUAGE 			"English"
 #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 EXTRASDOCUMENTROOT				"/mnt/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
 #ifdef CONFIG_SYSTEM_TUXBOX
 #define AUTHPASSWORD					"dbox2"
-#define PRIVATEDOCUMENTROOT				"/share/tuxbox/neutrino/httpd-y"
+#define PRIVATEDOCUMENTROOT				TARGETPREFIX"/share/tuxbox/neutrino/httpd-y"
 #endif
 
 #ifdef CONFIG_SYSTEM_TUXBOX_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
 #endif
 //-----------------------------------------------------------------------------

src/nhttpd/yhttpd.cpp

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