frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added failsafe defaults for 'make LCLBLD=1' to the Makefile

Browse Source
This commit is contained in:
Klaus Schmidinger 2020-06-15 13:07:55 +02:00
parent 8e1be83b56
commit 319df53e87
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3511,6 +3511,7 @@ Stefan Herdler <herdler@gmx.de>
for reporting a bug in using the default sort mode in a video directory without a for reporting a bug in using the default sort mode in a video directory without a
".sort" file ".sort" file
for reporting faulty memory handling in cString::Append() for reporting faulty memory handling in cString::Append()
for adding failsafe defaults for 'make LCLBLD=1' to the Makefile
Tobias Faust <tobias.faust@gmx.de> Tobias Faust <tobias.faust@gmx.de>
for the original "jumpingseconds" patch for the original "jumpingseconds" patch

2
HISTORY
View File

@ -9466,3 +9466,5 @@ Video Disk Recorder Revision History
- Revised 'Fixed a possible deadlock when detaching a receiver from a device' from - Revised 'Fixed a possible deadlock when detaching a receiver from a device' from
version 2.3.9, which sometimes caused a black screen when switching channels version 2.3.9, which sometimes caused a black screen when switching channels
(thanks to Stefan Verse). (thanks to Stefan Verse).
- Added failsafe defaults for 'make LCLBLD=1' to the Makefile (thanks to Stefan
Herdler).

10
Makefile
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 4.7 2020/06/03 12:22:05 kls Exp $ # $Id: Makefile 4.8 2020/06/15 13:07:55 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -28,6 +28,14 @@ CWD ?= $(shell pwd)
LSIDIR ?= $(CWD)/libsi LSIDIR ?= $(CWD)/libsi
PLUGINDIR ?= $(CWD)/PLUGINS PLUGINDIR ?= $(CWD)/PLUGINS
# Failsafe defaults for "make LCLBLD=1":
ifdef LCLBLD
DESTDIR ?= $(CWD)
LOCDIR ?= $(CWD)/locale
HDRDIR ?= $(CWD)/include
LIBDIR ?= $(PLUGINDIR)/lib
endif
DESTDIR ?= DESTDIR ?=
VIDEODIR ?= /srv/vdr/video VIDEODIR ?= /srv/vdr/video
CONFDIR ?= /var/lib/vdr CONFDIR ?= /var/lib/vdr