diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2020-06-15 13:07:55 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2020-06-15 13:07:55 +0200 |
| commit | 319df53e87ee48fc81650609cec3b00b82450d73 (patch) | |
| tree | 3d0625dff2d3c132694252ccd2aaf06a96e726fa | |
| parent | 8e1be83b56ee9570edce459a35e60201740f4779 (diff) | |
| download | vdr-319df53e87ee48fc81650609cec3b00b82450d73.tar.gz vdr-319df53e87ee48fc81650609cec3b00b82450d73.tar.bz2 | |
Added failsafe defaults for 'make LCLBLD=1' to the Makefile
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | Makefile | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 39888235..be633bd1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -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 ".sort" file 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> for the original "jumpingseconds" patch @@ -9466,3 +9466,5 @@ Video Disk Recorder Revision History - 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 (thanks to Stefan Verse). +- Added failsafe defaults for 'make LCLBLD=1' to the Makefile (thanks to Stefan + Herdler). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # 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: @@ -28,6 +28,14 @@ CWD ?= $(shell pwd) LSIDIR ?= $(CWD)/libsi PLUGINDIR ?= $(CWD)/PLUGINS +# Failsafe defaults for "make LCLBLD=1": +ifdef LCLBLD +DESTDIR ?= $(CWD) +LOCDIR ?= $(CWD)/locale +HDRDIR ?= $(CWD)/include +LIBDIR ?= $(PLUGINDIR)/lib +endif + DESTDIR ?= VIDEODIR ?= /srv/vdr/video CONFDIR ?= /var/lib/vdr |