Illumos #3189 kernel panic in test hotspare_onoffline_004_neg

[zfs.git] / module / Makefile.in

diff --git a/module/Makefile.in b/module/Makefile.in
index d9f73c2..c69b8a3 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -5,6 +5,11 @@ subdir-m += zcommon
 subdir-m += zfs
 subdir-m += zpios
 
+ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
+ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
+ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
+export ZFS_MODULE_CFLAGS
+
 modules:
        @# Make the exported SPL symbols available to these modules.
        @# They may be in the root of SPL_OBJ when building against
@@ -21,7 +26,7 @@ modules:
                "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
                exit 1; \
        fi
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
 
 clean:
        @# Only cleanup the kernel build directories when CONFIG_KERNEL
@@ -37,7 +42,11 @@ modules_install:
        $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
                INSTALL_MOD_PATH=$(DESTDIR) \
                INSTALL_MOD_DIR=addon/zfs $@
-       find $(DESTDIR)/lib/modules/ -name 'modules.*' | xargs $(RM)
+       @# Remove extraneous build products when packaging
+       if [ -n "$(DESTDIR)" ]; then \
+               find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
+                       -name 'modules.*' | xargs $(RM); \
+       fi
        sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
        if [ -f $$sysmap ]; then \
                depmod -ae -F $$sysmap @LINUX_VERSION@; \