2015-04-09 22:20:02 +02:00
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
|
|
|
index 89af931..674420c 100644
|
|
|
|
|
--- a/Makefile.am
|
|
|
|
|
+++ b/Makefile.am
|
|
|
|
|
@@ -12,10 +12,10 @@ endif
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
SUBDIRS += module
|
|
|
|
|
|
|
|
|
|
-extradir = @prefix@/src/spl-$(VERSION)
|
|
|
|
|
+extradir = @prefix@/libexec/spl
|
|
|
|
|
extra_HEADERS = spl.release.in spl_config.h.in
|
|
|
|
|
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
|
|
|
|
|
nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
diff --git a/include/Makefile.am b/include/Makefile.am
|
|
|
|
|
index 3200222..4a47aaa 100644
|
|
|
|
|
--- a/include/Makefile.am
|
|
|
|
|
+++ b/include/Makefile.am
|
|
|
|
|
@@ -13,6 +13,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
|
|
|
|
|
index e0da4b3..d6d7af0 100644
|
|
|
|
|
--- a/include/fs/Makefile.am
|
|
|
|
|
+++ b/include/fs/Makefile.am
|
|
|
|
|
@@ -8,6 +8,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/fs
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
|
|
|
|
|
index 1cca44a..e0d843b 100644
|
|
|
|
|
--- a/include/linux/Makefile.am
|
|
|
|
|
+++ b/include/linux/Makefile.am
|
|
|
|
|
@@ -19,6 +19,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/linux
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
|
|
|
|
|
index cfc8246..4fbd33d 100644
|
|
|
|
|
--- a/include/rpc/Makefile.am
|
|
|
|
|
+++ b/include/rpc/Makefile.am
|
|
|
|
|
@@ -9,6 +9,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/rpc
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
|
|
|
|
|
index 10e7093..febecdf 100644
|
|
|
|
|
--- a/include/sharefs/Makefile.am
|
|
|
|
|
+++ b/include/sharefs/Makefile.am
|
|
|
|
|
@@ -8,6 +8,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/sharefs
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
|
|
|
|
|
index 2d21c57..3958cfd 100644
|
|
|
|
|
--- a/include/sys/Makefile.am
|
|
|
|
|
+++ b/include/sys/Makefile.am
|
|
|
|
|
@@ -104,7 +104,7 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/sys
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
|
|
|
|
|
index 2821cbe..a84ce8e 100644
|
|
|
|
|
--- a/include/sys/fm/Makefile.am
|
|
|
|
|
+++ b/include/sys/fm/Makefile.am
|
|
|
|
|
@@ -9,6 +9,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/sys/fm
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
|
|
|
|
|
index 581083e..0c35fb7 100644
|
|
|
|
|
--- a/include/sys/fs/Makefile.am
|
|
|
|
|
+++ b/include/sys/fs/Makefile.am
|
|
|
|
|
@@ -8,6 +8,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/sys/fs
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
|
|
|
|
|
index 63d9af3..de1aa18 100644
|
|
|
|
|
--- a/include/sys/sysevent/Makefile.am
|
|
|
|
|
+++ b/include/sys/sysevent/Makefile.am
|
|
|
|
|
@@ -8,6 +8,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/sys/sysevent
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/util/Makefile.am b/include/util/Makefile.am
|
|
|
|
|
index b721b50..cbb9a05 100644
|
|
|
|
|
--- a/include/util/Makefile.am
|
|
|
|
|
+++ b/include/util/Makefile.am
|
|
|
|
|
@@ -9,6 +9,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/util
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/util
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
|
|
|
|
|
index 7faab0a..8148b3d 100644
|
|
|
|
|
--- a/include/vm/Makefile.am
|
|
|
|
|
+++ b/include/vm/Makefile.am
|
|
|
|
|
@@ -10,6 +10,6 @@ USER_H =
|
|
|
|
|
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
|
|
|
|
|
|
|
|
|
|
if CONFIG_KERNEL
|
|
|
|
|
-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
|
|
|
|
|
+kerneldir = @prefix@/libexec/spl/include/vm
|
|
|
|
|
kernel_HEADERS = $(KERNEL_H)
|
|
|
|
|
endif
|
|
|
|
|
diff --git a/module/Makefile.in b/module/Makefile.in
|
|
|
|
|
index 41c1010..3141397 100644
|
|
|
|
|
--- a/module/Makefile.in
|
|
|
|
|
+++ b/module/Makefile.in
|
|
|
|
|
@@ -21,15 +21,15 @@ clean:
|
|
|
|
|
modules_install:
|
|
|
|
|
@# Install the kernel modules
|
|
|
|
|
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
|
|
|
|
|
- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
|
|
|
|
|
+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
|
|
|
|
|
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
|
|
|
|
|
KERNELRELEASE=@LINUX_VERSION@
|
|
|
|
|
@# Remove extraneous build products when packaging
|
|
|
|
|
- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
|
|
|
|
|
+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
|
|
|
|
|
if [ -n $$kmoddir ]; then \
|
|
|
|
|
find $$kmoddir -name 'modules.*' | xargs $(RM); \
|
|
|
|
|
fi
|
|
|
|
|
- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
|
|
|
|
|
+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
|
|
|
|
|
if [ -f $$sysmap ]; then \
|
|
|
|
|
depmod -ae -F $$sysmap @LINUX_VERSION@; \
|
|
|
|
|
fi
|
