diff -up vdr-1.6.0/PLUGINS/src/sky/README~ vdr-1.6.0/PLUGINS/src/sky/README

--- vdr-1.6.0/PLUGINS/src/sky/README~	2007-08-12 14:08:16.000000000 +0300

+++ vdr-1.6.0/PLUGINS/src/sky/README	2008-03-23 16:24:18.000000000 +0200

@@ -37,7 +37,7 @@ derived from the actual channel data and

 data for each channel can be found (see below). Copy this file to your

 plugins config directory, in a subdirectory named 'sky', as in

-/video/plugins/sky/channels.conf.sky

+__CONFIGDIR__/plugins/sky/channels.conf.sky

 The Sky EPG is available on the Internet at http://www.bleb.org.

 The Perl script getskyepg.pl extracts the EPG data from these pages

diff -up vdr-1.6.0/epg2html.pl~ vdr-1.6.0/epg2html.pl

--- vdr-1.6.0/epg2html.pl~	2006-04-17 15:19:08.000000000 +0300

+++ vdr-1.6.0/epg2html.pl	2008-03-23 16:24:07.000000000 +0200

@@ -2,12 +2,12 @@

 # A simple EPG to HTML converter

 #

-# Converts the EPG data written by 'vdr' into the file /video/epg.data

+# Converts the EPG data written by 'vdr' into the file __CACHEDIR__/epg.data

 # into a simple HTML programme listing, consisting of one file per channel

 # plus an 'index.htm' file. All output files are written into the current

 # directory.

 #

-# Usage: epg2html < /video/epg.data

+# Usage: epg2html < __CACHEDIR__/epg.data

 #

 # See the main source file 'vdr.c' for copyright information and

 # how to reach the author.

diff -up vdr-1.6.0/vdr.1~ vdr-1.6.0/vdr.1

--- vdr-1.6.0/vdr.1~	2008-03-09 18:07:06.000000000 +0200

+++ vdr-1.6.0/vdr.1	2008-03-23 16:24:04.000000000 +0200

@@ -45,7 +45,7 @@ Send Dolby Digital audio to stdin of com

 .TP

 .BI \-c\  dir ,\ \-\-config= dir

 Read config files from directory \fIdir\fR

-(default is to read them from the video directory).

+(default is to read them from __CONFIGDIR__).

 .TP

 .B \-d, \-\-daemon

 Run in daemon mode (implies \-\-no\-kbd).

@@ -56,7 +56,7 @@ There may be several \fB\-D\fR options (

 .TP

 .BI \-E\  file ,\ \-\-epgfile= file

 Write the EPG data into the given \fIfile\fR

-(default is \fI/video/epg.data\fR).

+(default is \fI__CACHEDIR__/epg.data\fR).

 Use \fB\-E\-\fR to disable this.

 If \fIfile\fR is a directory, the file \fIepg.data\fR

 will be created in that directory.

@@ -80,7 +80,7 @@ If logging should be done to LOG_LOCAL\f

 LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).

 .TP

 .BI \-L\  dir ,\ \-\-lib= dir

-Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).

+Search for plugins in directory \fIdir\fR (default is __PLUGINDIR__).

 There can be several \fB\-L\fR options with different \fIdir\fR values.

 Each of them will apply to the \fB\-P\fR options following it.

 .TP

@@ -151,7 +151,7 @@ with VFAT file systems.

 .TP

 .BI \-v\  dir ,\ \-\-video= dir

 Use \fIdir\fR as video directory.

-The default is \fI/video\fR.

+The default is \fI__VIDEODIR__\fR.

 .TP

 .B \-V, \-\-version

 Print version information and exit.

diff -up vdr-1.6.0/vdr.5~ vdr-1.6.0/vdr.5

--- vdr-1.6.0/vdr.5~	2008-03-09 17:46:57.000000000 +0200

+++ vdr-1.6.0/vdr.5	2008-03-23 16:24:02.000000000 +0200

@@ -506,7 +506,7 @@ The file \fIsetup.conf\fR contains the b

 Each line contains one option in the format "Name = Value".

 See the MANUAL file for a description of the available options.

 .SS THEMES

-The files \fIthemes/<skin>\-<theme>.theme\fR in the config directory contain the

+The files \fI__VARDIR__/themes/<skin>\-<theme>.theme\fR contain the

 color theme definitions for the various skins. In the actual file names \fI<skin>\fR

 will be replaced by the name if the skin this theme belongs to, and \fI<theme>\fR

 will be the name of this theme.

diff -up vdr-1.6.0/vdr.c~ vdr-1.6.0/vdr.c

--- vdr-1.6.0/vdr.c~	2008-03-14 15:22:39.000000000 +0200

+++ vdr-1.6.0/vdr.c	2008-03-23 16:23:59.000000000 +0200

@@ -403,7 +403,7 @@ int main(int argc, char *argv[])

                "                           there may be several -D options (default: all DVB\n"

                "                           devices will be used)\n"

                "  -E FILE,  --epgfile=FILE write the EPG data into the given FILE (default is\n"

-               "                           '%s' in the video directory)\n"

+               "                           __CACHEDIR__/%s)\n"

                "                           '-E-' disables this\n"

                "                           if FILE is a directory, the default EPG file will be\n"

                "                           created in that directory\n"

@@ -560,7 +560,7 @@ int main(int argc, char *argv[])

      ConfigDirectory = DEFAULTCONFDIR;

   cPlugin::SetConfigDirectory(ConfigDirectory);

-  cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));

+  cThemes::SetThemesDirectory("__VARDIR__/themes");

   Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));

   if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&

@@ -595,7 +595,7 @@ int main(int argc, char *argv[])

         EpgDataFileName = DEFAULTEPGDATAFILENAME;

         }

      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')

-        EpgDirectory = VideoDirectory;

+        EpgDirectory = "__CACHEDIR__";

      if (EpgDirectory)

         cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));

      else

diff -up vdr-1.6.0/newplugin~ vdr-1.6.0/newplugin

--- vdr-1.6.0/newplugin~	2008-01-13 15:00:23.000000000 +0200

+++ vdr-1.6.0/newplugin	2008-03-23 16:23:49.000000000 +0200

@@ -24,7 +24,7 @@ $PLUGIN_VERSION = "0.0.1";

 $PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";

 $PLUGIN_MAINENTRY = $PLUGIN_CLASS;

-$PLUGINS_SRC = "PLUGINS/src";

+$PLUGINS_SRC = ".";

 $README = qq

 {This is a "plugin" for the Video Disk Recorder (VDR).