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

neutrino make nhttpd depend on neutrino's config.

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1046fd8a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2013-01-29 01:20:28 +08:00
parent 197e575b4f
commit 3b29bf4abe
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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 \