Changeset 108


Ignore:
Timestamp:
06/15/09 12:17:06 (11 years ago)
Author:
smurzch2
Message:

Better handling of CS_CONFDIR.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r107 r108  
    3939#----------------------- global options ------------------------------
    4040
    41 set (CS_CONFDIR "/usr/local/etc" CACHE STRING "Default path for the config files")
    42 add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
    43 
    4441if (OSCamOperatingSystem MATCHES "Linux")
    4542    add_definitions ("-DOS_LINUX")
     43    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
    4644elseif (OSCamOperatingSystem MATCHES "Mac OS X")
    4745    add_definitions ("-DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H -DUSE_PTHREAD")
     46    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
    4847elseif (OSCamOperatingSystem MATCHES "Tuxbox")
    4948    add_definitions ("-DOS_LINUX -DTUXBOX -DPPC")
     49    set (DEFAULT_CS_CONFDIR "/var/tuxbox/config")
    5050elseif (OSCamOperatingSystem MATCHES "Fonera2")
    5151    add_definitions ("-DOS_LINUX -DMIPSEL -DUCLIBC")
     52    set (DEFAULT_CS_CONFDIR "/var/etc")
    5253elseif (OSCamOperatingSystem MATCHES "Amino")
    5354    add_definitions ("-DOS_LINUX")
     55    set (DEFAULT_CS_CONFDIR "/usr/local/etc")
    5456endif (OSCamOperatingSystem MATCHES "Linux")
     57
     58set (CS_CONFDIR ${DEFAULT_CS_CONFDIR} CACHE STRING "Default path for the config files")
     59add_definitions ("-DCS_CONFDIR=\"${CS_CONFDIR}\"")
    5560
    5661#----------------------- subdirectories ------------------------------
  • trunk/oscam-config.h

    r21 r108  
    99#ifdef TUXBOX
    1010#  ifdef MIPSEL
    11 #    define CS_CONFDIR "/etc/tuxbox"
    1211#    define CS_LOGFILE "/dev/null"
    1312#  else
    14 #    define CS_CONFDIR "/var/tuxbox/config"
    1513#    define CS_LOGFILE "/dev/tty"
    1614#  endif
     
    3735#ifdef OS_CYGWIN32
    3836#  define CS_NOSHM
    39 #  define CS_CONFDIR "."
    4037#  define CS_MMAPFILE "oscam.mem"
    4138#  define CS_LOGFILE "/dev/tty"
Note: See TracChangeset for help on using the changeset viewer.