From 5c85a6ca2b45b581822907261cc8f24e1cb8072f Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Fri, 4 Jan 2008 12:18:08 +0000 Subject: - 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. --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') 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: -- cgit v1.2.3