--- vdr-2.4.0/newplugin.orig	2018-04-15 17:42:19.464011065 +0200
+++ vdr-2.4.0/newplugin	2018-04-15 17:42:56.071975982 +0200
@@ -24,7 +24,7 @@
 $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).
--- vdr-2.4.0/vdr.1.orig	2018-04-15 17:44:29.594888585 +0200
+++ vdr-2.4.0/vdr.1	2018-04-15 17:48:32.015340633 +0200
@@ -56,7 +56,7 @@
 .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).
@@ -137,7 +137,7 @@
 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
@@ -231,7 +231,7 @@
 .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.
--- vdr-2.4.0/vdr.5.orig	2018-04-15 17:51:02.213282179 +0200
+++ vdr-2.4.0/vdr.5	2018-04-15 17:52:51.799237923 +0200
@@ -714,7 +714,7 @@
 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.
--- vdr-2.4.0/vdr.c.orig	2018-04-15 17:53:51.107197519 +0200
+++ vdr-2.4.0/vdr.c	2018-04-15 17:54:44.512159912 +0200
@@ -750,7 +750,7 @@
   if (!ResourceDirectory)
      ResourceDirectory = DEFAULTRESDIR;
   cPlugin::SetResourceDirectory(ResourceDirectory);
-  cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
+  cThemes::SetThemesDirectory("__VARDIR__/themes");
 
   // Configuration data: