Changeset 108

Timestamp:

06/15/09 12:17:06 (14 years ago)

Author:

smurzch2

Message:

Better handling of CS_CONFDIR.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• oscam-config.h (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -39 +39 @@
 #----------------------- global options ------------------------------
 
-set (CS_CONFDIR "/usr/local/etc" CACHE STRING "Default path for the config files")
-add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
-
 if (OSCamOperatingSystem MATCHES "Linux")
     add_definitions ("-DOS_LINUX")
+    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
 elseif (OSCamOperatingSystem MATCHES "Mac OS X")
     add_definitions ("-DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H -DUSE_PTHREAD")
+    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
 elseif (OSCamOperatingSystem MATCHES "Tuxbox")
     add_definitions ("-DOS_LINUX -DTUXBOX -DPPC")
+    set (DEFAULT_CS_CONFDIR "/var/tuxbox/config")
 elseif (OSCamOperatingSystem MATCHES "Fonera2")
     add_definitions ("-DOS_LINUX -DMIPSEL -DUCLIBC")
+    set (DEFAULT_CS_CONFDIR "/var/etc")
 elseif (OSCamOperatingSystem MATCHES "Amino")
     add_definitions ("-DOS_LINUX")
+    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
 endif (OSCamOperatingSystem MATCHES "Linux")
+
+set (CS_CONFDIR ${DEFAULT_CS_CONFDIR} CACHE STRING "Default path for the config files")
+add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
 
 #----------------------- subdirectories ------------------------------

trunk/oscam-config.h

@@ -9 +9 @@
 #ifdef TUXBOX
 #  ifdef MIPSEL
-#    define CS_CONFDIR "/etc/tuxbox"
 #    define CS_LOGFILE "/dev/null"
 #  else
-#    define CS_CONFDIR "/var/tuxbox/config"
 #    define CS_LOGFILE "/dev/tty"
 #  endif
@@ -37 +35 @@
 #ifdef OS_CYGWIN32
 #  define CS_NOSHM
-#  define CS_CONFDIR "."
 #  define CS_MMAPFILE "oscam.mem"
 #  define CS_LOGFILE "/dev/tty"