Changed the default location for the LIRC socket to /var/run/lirc/lircd

This commit is contained in:
Klaus Schmidinger 2011-12-04 14:43:13 +01:00
parent a613816050
commit 7584780dbf
5 changed files with 9 additions and 6 deletions

View File

@ -1926,6 +1926,7 @@ Ville Skytt
for fixing several spelling errors for fixing several spelling errors
for adding generating a pkg-config file to the Makefile for adding generating a pkg-config file to the Makefile
for removing the '.pl' suffix from all scripts (thanks to Ville Skyttä). 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> Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next for fixing setting the colored button help after deleting a recording in case the next

View File

@ -6775,3 +6775,5 @@ Video Disk Recorder Revision History
recordings (thanks to Lars Hanisch). recordings (thanks to Lars Hanisch).
- Added generating a pkg-config file to the Makefile (thanks to Ville Skyttä). - Added generating a pkg-config file to the Makefile (thanks to Ville Skyttä).
- Removed the '.pl' suffix from all scripts (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ä).

View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: ### The C compiler and options:
@ -35,7 +35,7 @@ CONFDIR = $(VIDEODIR)
### The remote control: ### The remote control:
LIRC_DEVICE = /dev/lircd LIRC_DEVICE = /var/run/lirc/lircd
RCU_DEVICE = /dev/ttyS1 RCU_DEVICE = /dev/ttyS1
## Define if you want vdr to not run as root ## Define if you want vdr to not run as root

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .DELETE_ON_ERROR:
@ -62,7 +62,7 @@ DEFINES += -DBIDI
LIBS += $(shell pkg-config --libs fribidi) LIBS += $(shell pkg-config --libs fribidi)
endif endif
LIRC_DEVICE ?= /dev/lircd LIRC_DEVICE ?= /var/run/lirc/lircd
RCU_DEVICE ?= /dev/ttyS1 RCU_DEVICE ?= /dev/ttyS1
DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\" DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"

4
vdr.1
View File

@ -8,7 +8,7 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" 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" .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
.SH NAME .SH NAME
@ -120,7 +120,7 @@ Each of them will apply to the \fB\-P\fR options following it.
.TP .TP
.BI \-\-lirc[= path ] .BI \-\-lirc[= path ]
Use a LIRC remote control device. 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 .TP
.BI \-\-localedir= dir .BI \-\-localedir= dir
Search for locale files in \fIdir\fR (default is ./locale). Search for locale files in \fIdir\fR (default is ./locale).