summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS5
-rw-r--r--HISTORY3
-rw-r--r--INSTALL11
-rw-r--r--Makefile7
-rw-r--r--recording.c6
-rw-r--r--vdr.c5
6 files changed, 16 insertions, 21 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 821e286c..4fcc6cf0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2363,3 +2363,8 @@ Nan Feng <nfgx@21cn.com>
Edgar Toernig <froese@gmx.de>
for suggesting to not call FcFini() to avoid problems with older (broken) versions
of fontconfig
+
+Michael Nork <mnork0@gmx.net>
+ for suggesting to remove the compile time option VFAT to allow users of precompiled
+ binary distributions to have full control over whether or not to use the --vfat
+ option at runtime
diff --git a/HISTORY b/HISTORY
index ab7cc37f..eacc36ab 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5781,6 +5781,9 @@ Video Disk Recorder Revision History
they can correctly encode the strings.
- No longer calling FcFini() to avoid problems with older (broken) versions of
fontconfig (suggested by Edgar Toernig).
+- Removed the compile time option VFAT to allow users of precompiled binary
+ distributions to have full control over whether or not to use the --vfat option
+ at runtime (suggested by Michael Nork).
2008-05-03: Version 1.6.0-2
diff --git a/INSTALL b/INSTALL
index f61cb3bb..7294fabe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Installation of the Video Disk Recorder
---------------------------------------
-Version 1.6
+Version 1.7
-----------
Compiling and running the program:
@@ -57,13 +57,8 @@ These options accept an optional path to the remote control device,
the defaults of which can be set via the RCU_DEVICE and LIRC_DEVICE macros,
respectively.
-If your video directory will be on a VFAT partition, add the compile
-time switch
-
- VFAT=1
-
-to the 'make' command. Alternatively, you can call VDR with the command
-line option '--vfat'.
+If your video directory will be on a VFAT partition, you can call VDR with
+the command line option '--vfat'.
When running, the 'vdr' program writes status information into the
system log file, which is usually /var/log/messages (or /var/log/user.log,
diff --git a/Makefile b/Makefile
index ebc415d6..c6efa373 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 2.1 2008/04/19 10:58:56 kls Exp $
+# $Id: Makefile 2.2 2008/05/03 10:13:43 kls Exp $
.DELETE_ON_ERROR:
@@ -70,11 +70,6 @@ DEFINES += -DLOCDIR=\"$(LOCDIR)\"
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-ifdef VFAT
-# for people who want their video directory on a VFAT partition
-DEFINES += -DVFAT
-endif
-
all: vdr i18n
# Implicit rules:
diff --git a/recording.c b/recording.c
index e0172ed7..5954662b 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recording.c 2.1 2008/05/01 15:33:39 kls Exp $
+ * $Id: recording.c 2.2 2008/05/03 10:16:10 kls Exp $
*/
#include "recording.h"
@@ -31,8 +31,8 @@
/* This was the original code, which works fine in a Linux only environment.
Unfortunately, because of Windows and its brain dead file system, we have
to use a more complicated approach, in order to allow users who have enabled
- the VFAT compile time option to see their recordings even if they forget to
- enable VFAT when compiling a new version of VDR... Gee, do I hate Windows.
+ the --vfat command line option to see their recordings even if they forget to
+ enable --vfat when restarting VDR... Gee, do I hate Windows.
(kls 2002-07-27)
#define DATAFORMAT "%4d-%02d-%02d.%02d:%02d.%02d.%02d" RECEXT
#define NAMEFORMAT "%s/%s/" DATAFORMAT
diff --git a/vdr.c b/vdr.c
index 5ea62d69..6d74845a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $
+ * $Id: vdr.c 2.1 2008/05/03 10:16:41 kls Exp $
*/
#include <getopt.h>
@@ -210,9 +210,6 @@ int main(int argc, char *argv[])
#elif defined(REMOTE_RCU)
RcuDevice = RCU_DEVICE;
#endif
-#if defined(VFAT)
- VfatFileSystem = true;
-#endif
#if defined(VDR_USER)
VdrUser = VDR_USER;
#endif