X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile;h=eacd25ee911a5ad228ca7fffd2d6a2da29fd438c;hb=215c7520fb6e8e3dce00d674859544da6598b747;hp=5277386915d87ce6bf7afefdb164e274b0879212;hpb=58ee8fea5ffd5c65a77a94ce1c434bd6e8eb2efa;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index 52773869..eacd25ee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,20 @@
 #
 
 ifneq ($(KERNELRELEASE),)
-ifneq ($(CONFIG_TRACEPOINTS),)
 
-KERNELDIR=${LTTNG_KERNELDIR}
+ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
+ifeq ($(CONFIG_TRACEPOINTS),)
+$(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+endif # CONFIG_TRACEPOINTS
+endif # ifdef CONFIG_LOCALVERSION
+
+KERNELDIR = ${LTTNG_KERNELDIR}
+MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
 lttng_check_linux_version = $(shell pwd)/include/linux/version.h
 lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
 
+
 #
 # Check for stale version.h, which can be a leftover from an old Linux
 # kernel tree moved to a newer kernel version, only pruned by make
@@ -21,7 +28,7 @@ $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
 endif
 endif
 
-include $(KBUILD_EXTMOD)/Makefile.ABI.workarounds
+include $(MAKEFILEDIR)/Makefile.ABI.workarounds
 
 obj-m += lttng-ring-buffer-client-discard.o
 obj-m += lttng-ring-buffer-client-overwrite.o
@@ -65,8 +72,6 @@ lttng-tracer-objs += $(shell \
 obj-m += probes/
 obj-m += lib/
 
-endif # CONFIG_TRACEPOINTS
-
 else # KERNELRELEASE
 	KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)