From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 15 Jul 2011 15:49:27 +0000 (-0400)
Subject: Support LTTng 3.0 release numbering for perf object build
X-Git-Tag: v2.0-pre1~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1386746ec7bbb15e399acdc014cea85f7538552d;p=lttng-modules.git

Support LTTng 3.0 release numbering for perf object build

Reported-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/Makefile b/Makefile
index 1384ce48..584ca6b1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
 
 ifneq ($(CONFIG_PERF_EVENTS),)
 ltt-relay-objs += $(shell \
-	if [ $(VERSION) -ge 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 ] ; then \
+	if [ $(VERSION) -ge 3 \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
 		echo "lttng-context-perf-counters.o" ; fi;)
 endif