neutrino: fix most hardcoded paths

Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp

src/driver/pictureviewer/pictureviewer.cpp

@@ -459,7 +459,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height)
 	}
 }
 
-#define LOGO_DIR1 "/share/tuxbox/neutrino/icons/logo"
+#define LOGO_DIR1 DATADIR "/neutrino/icons/logo"
 #define LOGO_FMT ".jpg"
 
 bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, std::string & name, int *width, int *height)

src/eitd/SIlanguage.cpp

@@ -36,8 +36,6 @@
 
 #include "SIlanguage.hpp"
 
-static const char LANGUAGEFILE[] =  CONFIGDIR "/epglanguages.conf";
-
 std::vector<std::string> SIlanguage::languages;
 pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER;
 

src/eitd/SIlanguage.hpp

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

src/gui/bookmarkmanager.h

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

src/gui/keybind_setup.cpp

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

src/gui/settings_manager.cpp

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

src/nhttpd/yconfig.h

@@ -118,7 +118,7 @@
 // switch for Box differences
 #ifdef CONFIG_SYSTEM_TUXBOX
 #define AUTHPASSWORD					"dbox2"
-#define PRIVATEDOCUMENTROOT				DATADIR"/httpd-y"
+#define PRIVATEDOCUMENTROOT				DATADIR "/neutrino/httpd-y"
 #endif
 
 #ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM

src/nhttpd/yhttpd_mods/Makefile.am

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

src/nhttpd/yhttpd_mods/mod_yparser.cpp

@@ -3,6 +3,8 @@
 // yParser
 //=============================================================================
 // C
+#include <config.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <stdio.h>

src/system/localize.cpp

@@ -111,7 +111,7 @@ CLocaleManager::~CLocaleManager()
 	delete[] defaultData;
 }
 
-const char * path[2] = {CONFIGDIR "/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)
 {

src/zapit/include/zapit/zapit.h

@@ -21,8 +21,8 @@
 
 #define PAL	0
 #define NTSC	1
-#define AUDIO_CONFIG_FILE "/var/tuxbox/config/zapit/audio.conf"
-#define VOLUME_CONFIG_FILE "/var/tuxbox/config/zapit/volume.conf"
+#define AUDIO_CONFIG_FILE	CONFIGDIR "/zapit/audio.conf"
+#define VOLUME_CONFIG_FILE	CONFIGDIR "/zapit/volume.conf"
 
 typedef std::map<t_channel_id, audio_map_set_t> audio_map_t;
 typedef audio_map_t::iterator audio_map_iterator_t;