pyrox.dev
1diff --git a/Makefile.am b/Makefile.am
2index 4977448..ac17217 100644
3--- a/Makefile.am
4+++ b/Makefile.am
5@@ -12,10 +12,10 @@ endif
6 if CONFIG_KERNEL
7 SUBDIRS += module
8
9-extradir = @prefix@/src/spl-$(VERSION)
10+extradir = @prefix@/libexec/spl
11 extra_HEADERS = spl.release.in spl_config.h.in
12
13-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
14+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
15 nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
16 endif
17
18diff --git a/include/Makefile.am b/include/Makefile.am
19index 3200222..4a47aaa 100644
20--- a/include/Makefile.am
21+++ b/include/Makefile.am
22@@ -13,6 +13,6 @@ USER_H =
23 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
24
25 if CONFIG_KERNEL
26-kerneldir = @prefix@/src/spl-$(VERSION)/include
27+kerneldir = @prefix@/libexec/spl/include
28 kernel_HEADERS = $(KERNEL_H)
29 endif
30diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
31index e0da4b3..d6d7af0 100644
32--- a/include/fs/Makefile.am
33+++ b/include/fs/Makefile.am
34@@ -8,6 +8,6 @@ USER_H =
35 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
36
37 if CONFIG_KERNEL
38-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
39+kerneldir = @prefix@/libexec/spl/include/fs
40 kernel_HEADERS = $(KERNEL_H)
41 endif
42diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
43index 712e94e..4af9fb7 100644
44--- a/include/linux/Makefile.am
45+++ b/include/linux/Makefile.am
46@@ -18,6 +18,6 @@ USER_H =
47 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
48
49 if CONFIG_KERNEL
50-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
51+kerneldir = @prefix@/libexec/spl/include/linux
52 kernel_HEADERS = $(KERNEL_H)
53 endif
54diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
55index cfc8246..4fbd33d 100644
56--- a/include/rpc/Makefile.am
57+++ b/include/rpc/Makefile.am
58@@ -9,6 +9,6 @@ USER_H =
59 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
60
61 if CONFIG_KERNEL
62-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
63+kerneldir = @prefix@/libexec/spl/include/rpc
64 kernel_HEADERS = $(KERNEL_H)
65 endif
66diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
67index 10e7093..febecdf 100644
68--- a/include/sharefs/Makefile.am
69+++ b/include/sharefs/Makefile.am
70@@ -8,6 +8,6 @@ USER_H =
71 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
72
73 if CONFIG_KERNEL
74-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
75+kerneldir = @prefix@/libexec/spl/include/sharefs
76 kernel_HEADERS = $(KERNEL_H)
77 endif
78diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
79index 73c4a84..31a9f50 100644
80--- a/include/sys/Makefile.am
81+++ b/include/sys/Makefile.am
82@@ -107,7 +107,7 @@ USER_H =
83 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
84
85 if CONFIG_KERNEL
86-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
87+kerneldir = @prefix@/libexec/spl/include/sys
88 kernel_HEADERS = $(KERNEL_H)
89 endif
90
91diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
92index 2821cbe..a84ce8e 100644
93--- a/include/sys/fm/Makefile.am
94+++ b/include/sys/fm/Makefile.am
95@@ -9,6 +9,6 @@ USER_H =
96 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
97
98 if CONFIG_KERNEL
99-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
100+kerneldir = @prefix@/libexec/spl/include/sys/fm
101 kernel_HEADERS = $(KERNEL_H)
102 endif
103diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
104index 581083e..0c35fb7 100644
105--- a/include/sys/fs/Makefile.am
106+++ b/include/sys/fs/Makefile.am
107@@ -8,6 +8,6 @@ USER_H =
108 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
109
110 if CONFIG_KERNEL
111-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
112+kerneldir = @prefix@/libexec/spl/include/sys/fs
113 kernel_HEADERS = $(KERNEL_H)
114 endif
115diff --git a/include/util/Makefile.am b/include/util/Makefile.am
116index e2bf09f..3f5d6ce 100644
117--- a/include/util/Makefile.am
118+++ b/include/util/Makefile.am
119@@ -9,6 +9,6 @@ USER_H =
120 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
121
122 if CONFIG_KERNEL
123-kerneldir = @prefix@/src/spl-$(VERSION)/include/util
124+kerneldir = @prefix@/libexec/spl/include/util
125 kernel_HEADERS = $(KERNEL_H)
126 endif
127diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
128index 7faab0a..8148b3d 100644
129--- a/include/vm/Makefile.am
130+++ b/include/vm/Makefile.am
131@@ -10,6 +10,6 @@ USER_H =
132 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
133
134 if CONFIG_KERNEL
135-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
136+kerneldir = @prefix@/libexec/spl/include/vm
137 kernel_HEADERS = $(KERNEL_H)
138 endif
139diff --git a/module/Makefile.in b/module/Makefile.in
140index d4e62e1..73fa01c 100644
141--- a/module/Makefile.in
142+++ b/module/Makefile.in
143@@ -21,15 +21,15 @@ clean:
144 modules_install:
145 @# Install the kernel modules
146 $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
147- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
148+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
149 INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
150 KERNELRELEASE=@LINUX_VERSION@
151 @# Remove extraneous build products when packaging
152- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
153- if [ -n "$(DESTDIR)" ]; then \
154+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
155+ if [ -n "@prefix@" ]; then \
156 find $$kmoddir -name 'modules.*' | xargs $(RM); \
157 fi
158- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
159+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
160 if [ -f $$sysmap ]; then \
161 depmod -ae -F $$sysmap @LINUX_VERSION@; \
162 fi