From 7584780dbf4e7bc8446be29e17d8850f6ca82d02 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 4 Dec 2011 14:43:13 +0100
Subject: [PATCH] Changed the default location for the LIRC socket to
 /var/run/lirc/lircd

---
 CONTRIBUTORS         | 1 +
 HISTORY              | 2 ++
 Make.config.template | 4 ++--
 Makefile             | 4 ++--
 vdr.1                | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 416e9d3e..7cf7ae84 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1926,6 +1926,7 @@ Ville Skytt
  for fixing several spelling errors
  for adding generating a pkg-config file to the Makefile
  for removing the '.pl' suffix from all scripts (thanks to Ville Skyttä).
+ for changing the default location for the LIRC socket to /var/run/lirc/lircd
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index d342dc94..cc93f4fc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6775,3 +6775,5 @@ Video Disk Recorder Revision History
   recordings (thanks to Lars Hanisch).
 - Added generating a pkg-config file to the Makefile (thanks to Ville Skyttä).
 - Removed the '.pl' suffix from all scripts (thanks to Ville Skyttä).
+- Changed the default location for the LIRC socket to /var/run/lirc/lircd (thanks
+  to Ville Skyttä).
diff --git a/Make.config.template b/Make.config.template
index 1fc8227a..0de5bb97 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 2.3 2011/03/13 13:41:12 kls Exp $
+# $Id: Make.config.template 2.4 2011/12/04 14:41:00 kls Exp $
 
 ### The C compiler and options:
 
@@ -35,7 +35,7 @@ CONFDIR  = $(VIDEODIR)
 
 ### The remote control:
 
-LIRC_DEVICE = /dev/lircd
+LIRC_DEVICE = /var/run/lirc/lircd
 RCU_DEVICE  = /dev/ttyS1
 
 ## Define if you want vdr to not run as root
diff --git a/Makefile b/Makefile
index c6b8fe2f..e6af30eb 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.21 2011/12/04 14:17:35 kls Exp $
+# $Id: Makefile 2.22 2011/12/04 14:41:00 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -62,7 +62,7 @@ DEFINES += -DBIDI
 LIBS += $(shell pkg-config --libs fribidi)
 endif
 
-LIRC_DEVICE ?= /dev/lircd
+LIRC_DEVICE ?= /var/run/lirc/lircd
 RCU_DEVICE  ?= /dev/ttyS1
 
 DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
diff --git a/vdr.1 b/vdr.1
index 4c0a9785..d8322e18 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.6 2011/08/15 12:28:54 kls Exp $
+.\" $Id: vdr.1 2.7 2011/12/04 14:41:00 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -120,7 +120,7 @@ Each of them will apply to the \fB\-P\fR options following it.
 .TP
 .BI \-\-lirc[= path ]
 Use a LIRC remote control device.
-If \fIpath\fR is omitted, vdr uses \fI/dev/lircd\fR.
+If \fIpath\fR is omitted, vdr uses \fI/var/run/lirc/lircd\fR.
 .TP
 .BI \-\-localedir= dir
 Search for locale files in \fIdir\fR (default is ./locale).