projects / packages / lttng-modules.git / blame
| Commit | Line | Data |
|---|---|---|
| b5a5bc4f JB |
1 | --- lttng-modules-2.6.3/Makefile.orig 2015-09-14 20:30:29.749794009 +0200 |
| 2 | +++ lttng-modules-2.6.3/Makefile 2015-09-14 20:31:10.693125624 +0200 | |
| 3 | @@ -8,8 +8,8 @@ | |
| 4 | KERNELDIR = ${LTTNG_KERNELDIR} | |
| 5 | MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST))) | |
| 7528c1a9 JR |
6 | |
| 7 | -lttng_check_linux_version = $(shell pwd)/include/linux/version.h | |
| 8 | -lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| 7528c1a9 JR |
9 | +#lttng_check_linux_version = $(shell pwd)/include/linux/version.h |
| 10 | +#lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| b5a5bc4f JB |
11 | |
| 12 | ||
| 7528c1a9 | 13 | # |
| b5a5bc4f | 14 | @@ -17,11 +17,11 @@ |
| 7528c1a9 JR |
15 | # kernel tree moved to a newer kernel version, only pruned by make |
| 16 | # distclean. | |
| 17 | # | |
| 18 | -ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 19 | -ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 20 | -$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) | |
| 21 | -endif | |
| 22 | -endif | |
| 23 | +#ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 24 | +#ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 25 | +#$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) | |
| 26 | +#endif | |
| 27 | +#endif | |
| 28 | ||
| b5a5bc4f JB |
29 | include $(MAKEFILEDIR)/Makefile.ABI.workarounds |
| 30 |