summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-02-24 00:35:52 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-02-24 00:35:52 +0100
commit06d41e3eb782dc9d6d44477be0628bbce0e56297 (patch)
tree3dd1727559ffaba978b053cb8e451fbdceedb606 /Makefile
parent92a1f540022559dbf2da644f65a08d8bb56a33fb (diff)
downloadvdr-plugin-live-06d41e3eb782dc9d6d44477be0628bbce0e56297.tar.gz
vdr-plugin-live-06d41e3eb782dc9d6d44477be0628bbce0e56297.tar.bz2
Fix listener bug triggered by never versions of cxxtools reported in bug #1066
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index af04aa8..ab2f2b5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,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)
TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+CXXTOOLVER = $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
TNTVERS7 = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"; fi)
CXXFLAGS += $(shell tntnet-config --cxxflags)
@@ -73,7 +74,7 @@ ifneq ($(TNTVERS7),yes)
LIBS += httpd/libhttpd.a
endif
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION)
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION) -DCXXTOOLVER=$(CXXTOOLVER)
SUBDIRS = pages css javascript
ifneq ($(TNTVERS7),yes)