From 0633053d5db66e4a35f027899a13225daa537a78 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 9 Feb 2015 10:00:57 +0100
Subject: [PATCH] Added "#REMOTE=LIRC" to Make.config.template

---
 CONTRIBUTORS         | 1 +
 HISTORY              | 1 +
 Make.config.template | 5 ++++-
 UPDATE-2.2.0         | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 49fbcee4..d7e14add 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1703,6 +1703,7 @@ Martin Dauskardt <md001@gmx.de>
  cDevice::TrickSpeed()
  for renaming 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
  in 'make install'
+ for suggesting to add "#REMOTE=LIRC" to Make.config.template
 
 Maynard Cedric <maynard.cedric@wanadoo.fr>
  for reporting a problem in handling the color button texts in cMenuEditStrItem
diff --git a/HISTORY b/HISTORY
index 965a37d7..b1e5c09f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8528,3 +8528,4 @@ Video Disk Recorder Revision History
 - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
 - Updated the Romanian OSD texts (thanks to Lucian Muresan).
 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
+- Added "#REMOTE=LIRC" to Make.config.template (suggested by Martin Dauskardt).
diff --git a/Make.config.template b/Make.config.template
index 523926bd..8768f3b9 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.3 2015/02/02 09:07:07 kls Exp $
+# $Id: Make.config.template 3.4 2015/02/09 09:58:45 kls Exp $
 
 ### The C compiler and options:
 
@@ -69,6 +69,9 @@ endif
 ### The remote control:
 LIRC_DEVICE = /var/run/lirc/lircd
 
+### Define if you always want to use LIRC, independent of the --lirc option:
+#REMOTE=LIRC
+
 ### Define if you don't want keyboard remote control:
 #NO_KBD = 1
 
diff --git a/UPDATE-2.2.0 b/UPDATE-2.2.0
index fe516bdb..b8fe202e 100644
--- a/UPDATE-2.2.0
+++ b/UPDATE-2.2.0
@@ -378,7 +378,7 @@ Misc:
   "Mo.Di.Mi.Do.Fr.Sa.So.".
 - Added the channel name to log messages that reference a channel.
 - Added ARGSDIR to the ONEDIR section of Make.config.template.
-- Added SDNOTIFY, NO_KBD and BIDI to Make.config.template.
+- Added SDNOTIFY, NO_KBD, BIDI and REMOTE to Make.config.template.
 - Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
 - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
   two separate positions.