Changed default vtx cache dir to the more FHS conform location /var/cache/vdr/vtx

5 files changed, 4 insertions, 10 deletions

diff --git a/README b/README
index 865dc52..2788c6c 100644
--- a/README
+++ b/README
@@ -76,8 +76,7 @@ Command line options:
    
      -d        --directory=DIR    The directory where the temporary
                                   files will be stored.
-                                  (standard value: /vtx, recommended: /tmp/vtx
-                                   or /var/cache/vdr/osdteletext.)
+                                  (standard value: /var/cache/vdr/vtx)
                                   Ensure that the directory exists and is writable.
      -n        --max-cache=NUM    Maximum size in megabytes of cache used
                                   to store the pages on the harddisk.
diff --git a/README.DE b/README.DE
index 2384e81..f624337 100644
--- a/README.DE
+++ b/README.DE
@@ -63,8 +63,7 @@ Kommandozeilen-Optionen:
    Verfügbare Optionen:
    
      -d        --directory=DIR    Das Verzeichnis für die temporären Dateien.
-                                  (Voreinstellung: /vtx, empfohlen: /tmp/vtx
-                                   oder /var/cache/vdr/osdteletext.)
+                                  (Voreinstellung: /var/cache/vdr/vtx)
                                   Stellen Sie sicher, dass das Verzeichnis existiert
                                   und beschreibbar ist.
      -n        --max-cache=NUM    Maximale Größe des Zwischenspeichers für Seiten
diff --git a/menu.c b/menu.c
index cfefff7..be10632 100644
--- a/menu.c
+++ b/menu.c
@@ -20,9 +20,6 @@
 #include "setup.h"
 #include "txtrecv.h"
 
-
-#define TXTROOT "/vtx"
-
 #define GET_HUNDREDS(x) ( ( (x) - ((x)%256) ) /256 )
 #define GET_TENS(x)  ( (( (x) - ((x)%16) )%256 ) /16 )
 #define GET_ONES(x)   ( (x)%16 )
diff --git a/osdteletext.c b/osdteletext.c
index a7dfbcd..9d33a6c 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -121,8 +121,7 @@ const char *cPluginTeletextosd::CommandLineHelp(void)
   // Return a string that describes all known command line options.
   return "  -d        --directory=DIR    The directory where the temporary\n"
          "                               files will be stored.\n"
-         "                               (default: /vtx, recommended: /tmp/vtx\n"
-         "                                or /var/cache/vdr/osdteletext.)\n"
+         "                               (default: /var/cache/vdr/vtx)\n"
          "                               Ensure that the directory exists and is writable.\n"
          "  -n        --max-cache=NUM    Maximum size in megabytes of cache used\n"
          "                               to store the pages on the harddisk.\n"
diff --git a/txtrecv.c b/txtrecv.c
index 73ba499..1f73241 100644
--- a/txtrecv.c
+++ b/txtrecv.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-const char *RootDir::root = "/vtx";
+const char *RootDir::root = "/var/cache/vdr/vtx";
 
 void RootDir::setRootDir(const char *newRoot) {
    root=newRoot;