Support custom build directories and move includes

[mirror_zfs.git] / module / nvpair / Makefile.in

diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in
index 3f643e724d10508f4b6a218921c8b5050afb9b38..71c748e5fcc3e57979d544559d7b771b7f2f9c37 100644 (file)
--- a/module/nvpair/Makefile.in
+++ b/module/nvpair/Makefile.in
@@ -1,10 +1,12 @@
 MODULE := znvpair
 
-EXTRA_CFLAGS  = -I@MODDIR@/nvpair/include
-EXTRA_CFLAGS += @KERNELCPPFLAGS@
+EXTRA_CFLAGS  = @KERNELCPPFLAGS@
+EXTRA_CFLAGS += -include @SPL_OBJ@/spl_config.h
+EXTRA_CFLAGS += -include @abs_top_builddir@/zfs_config.h
+EXTRA_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
 
-obj-m := ${MODULE}.o
+obj-m := $(MODULE).o
 
-${MODULE}-objs += nvpair.o
-${MODULE}-objs += nvpair_alloc_spl.o
-${MODULE}-objs += nvpair_alloc_fixed.o
+$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair.o
+$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair_alloc_spl.o
+$(MODULE)-objs += @top_srcdir@/module/nvpair/nvpair_alloc_fixed.o