summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-01-04 12:18:08 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-01-04 12:18:08 +0000
commit5c85a6ca2b45b581822907261cc8f24e1cb8072f (patch)
treed634cc5db6b1740181d8f1af4c5c1012f50d5660
parentee21e04747754ec322ab7bc7ad187618053c5bb4 (diff)
downloadvdr-plugin-live-5c85a6ca2b45b581822907261cc8f24e1cb8072f.tar.gz
vdr-plugin-live-5c85a6ca2b45b581822907261cc8f24e1cb8072f.tar.bz2
- A change in the TNTVERS7 detection shell command does not use bash
features. So the previous commit could be 'reverted' and bash is no longer a needed prerequisite for LIVE.
-rw-r--r--Makefile9
-rw-r--r--README3
-rw-r--r--doc/ChangeLog2
3 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index ba85b68..ebc6592 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.59 2008/01/04 11:34:16 tadi Exp $
-
-# Because of shell features used in this Makefile that are provided
-# only by bash we set the shell to bash
-
-SHELL = /bin/bash
+# $Id: Makefile,v 1.60 2008/01/04 12:18:08 tadi Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,7 +42,7 @@ TMPDIR ?= /tmp
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
I18NTARG = $(shell if [ `echo $(APIVERSION) | tr [.] [0]` -ge "10507" ]; then echo "i18n"; fi)
-TNTVERS7 = $(shell ver=`tntnet-config --version | sed -e's/\.//g'`; ver=$$(($$ver<100?$$ver*100:($$ver<1000?$$ver*10:$$ver))); if [ $$ver -ge "1606" ]; then echo "yes"; fi)
+TNTVERS7 = $(shell ver=`tntnet-config --version | sed -e's/\.//g' | awk '/^..$$/ { print $$1."00"} /^...$$/ { print $$1."0"} /^....$$/ { print $$1 }'`; if [ $$ver -ge "1606" ]; then echo "yes"; fi)
### The name of the distribution archive:
diff --git a/README b/README
index 1a287b9..1bc093f 100644
--- a/README
+++ b/README
@@ -60,9 +60,6 @@ boost >= 1.32.0 - http://www.boost.org
Tntnet >= 1.5.3 - http://www.tntnet.org/download.hms
Cxxtools >= 1.4.3 - http://www.tntnet.org/download.hms
-The LIVE Makefile makes use of bash features. So you need to have /bin/bash
-installed on your system (It needs not to bee the default shell).
-
Tntnet provides basic webserver functions for live and needs cxxtools.
Boost provides some data structures we need. While currently relying on the
full blown package we might provide a stripped down version in the future.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 75e28af..4786f65 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,8 @@
* Makefile: Thanks to user 'ernie' in vdr-portal.de, who pointed
out that the Makefile uses a bashism without setting SHELL to
bash.
+ UPDATE: User 'Keef' pointed out a way to omit bash arithmetic
+ expressions. So the dependency on bash could be dropped again.
2007-12-25 Dieter Hametner <dh+vdr at gekrumbel dot de>