From bfdd611fde17ee57bd90cbefa4c3c4f731f613bc Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 1 Jan 2015 13:55:13 +0100 Subject: [PATCH] Fixed a bug in the Makefile when installing plugins with LCLBLD=1 --- CONTRIBUTORS | 1 + HISTORY | 4 +++- Makefile | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 51951f3f..3368ca15 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -232,6 +232,7 @@ Stefan Huelswitt featured DVB cards for pointing out a bug in handling lowercase polarization characters in channel definitions if no DiSEqC is used + for fixing a bug in the Makefile when installing plugins with LCLBLD=1 Ulrich Röder for pointing out that there are channels that have a symbol rate higher than 27500 diff --git a/HISTORY b/HISTORY index 543adbf1..c5ef9406 100644 --- a/HISTORY +++ b/HISTORY @@ -8307,7 +8307,7 @@ Video Disk Recorder Revision History - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and the functional modification to cFont::CreateFont(). -2014-10-03: Version 2.1.7 +2015-01-01: Version 2.1.7 - No longer logging an error message in DirSizeMB() if the given directory doesn't exist. This avoids lots of log entries in case several VDRs use the same video @@ -8321,3 +8321,5 @@ Video Disk Recorder Revision History to Lars Hanisch). See vdr.1 and vdr.5 for details. - Fixed a possible crash in the LCARS skin (thanks to Thomas Reufer). - Updated the dvbhddevice plugin source. +- Fixed a bug in the Makefile when installing plugins with LCLBLD=1 (thanks to + Stefan Huelswitt). diff --git a/Makefile b/Makefile index 0fc382e7..40a610ae 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 3.3 2014/04/14 12:08:24 kls Exp $ +# $Id: Makefile 3.4 2015/01/01 13:52:07 kls Exp $ .DELETE_ON_ERROR: @@ -228,7 +228,7 @@ plugins: include-dir vdr.pc INCLUDES="-I$(CWD)/include"\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\ if [ -n "$(LCLBLD)" ] ; then\ - (cd $(PLUGINDIR)/src/$$i; for l in `find -name 'libvdr-*.so' -o -name 'lib$$i-*.so'`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\ + (cd $(PLUGINDIR)/src/$$i; for l in `find -name "libvdr-*.so" -o -name "lib$$i-*.so"`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\ if [ -d $(PLUGINDIR)/src/$$i/po ]; then\ for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\ install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\