git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement database to workaround misreported physical sector sizes
[zfs.git]
/
module
/
Makefile.in
diff --git
a/module/Makefile.in
b/module/Makefile.in
index
50cbb58
..
4c6d381
100644
(file)
--- a/
module/Makefile.in
+++ b/
module/Makefile.in
@@
-5,6
+5,13
@@
subdir-m += zcommon
subdir-m += zfs
subdir-m += zpios
subdir-m += zfs
subdir-m += zpios
+INSTALL_MOD_DIR ?= extra
+
+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
modules:
@# Make the exported SPL symbols available to these modules.
@# They may be in the root of SPL_OBJ when building against
@@
-21,7
+28,7
@@
modules:
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
exit 1; \
fi
"*** - @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
clean:
@# Only cleanup the kernel build directories when CONFIG_KERNEL
@@
-34,22
+41,25
@@
clean:
modules_install:
@# Install the kernel modules
modules_install:
@# Install the kernel modules
- $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
- INSTALL_MOD_PATH=$(DESTDIR) \
- INSTALL_MOD_DIR=
addon/zfs $@
+ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd`
$@
\
+ INSTALL_MOD_PATH=$(DESTDIR)
$(INSTALL_MOD_PATH)
\
+ INSTALL_MOD_DIR=
$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
@# Remove extraneous build products when packaging
-
if [ -n "$(DESTDIR)" ]; then
\
-
find $(DESTDIR)/lib/modules/@LINUX_VERSION@
\
-
-name 'modules.*' | xargs $(RM); \
+
kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@;
\
+
if [ -n $$kmoddir ]; then
\
+
find $$kmoddir
-name 'modules.*' | xargs $(RM); \
fi
fi
- sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
+ sysmap=$(DESTDIR)
$(INSTALL_MOD_PATH)
/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
- $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs
+ kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
+ list='$(subdir-m)'; for subdir in $$list; do \
+ $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
+ done
distdir:
distdir: