pyrox.dev
1diff --git a/Makefile.am b/Makefile.am
2index 49b417a..f4af44d 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/zfs-$(VERSION)
10+extradir = @prefix@/libexec/zfs-$(VERSION)
11 extra_HEADERS = zfs.release.in zfs_config.h.in
12
13-kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
14+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
15 nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
16 endif
17
18diff --git a/include/Makefile.am b/include/Makefile.am
19index a94cad5..a160fe2 100644
20--- a/include/Makefile.am
21+++ b/include/Makefile.am
22@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
23 endif
24
25 if CONFIG_KERNEL
26-kerneldir = @prefix@/src/zfs-$(VERSION)/include
27+kerneldir = @prefix@/include
28 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
29 endif
30diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
31index d00b1c8..3242d2e 100644
32--- a/include/linux/Makefile.am
33+++ b/include/linux/Makefile.am
34@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
35 endif
36
37 if CONFIG_KERNEL
38-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
39+kerneldir = @prefix@/include/linux
40 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
41 endif
42diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
43index 7ddace0..8da3870 100644
44--- a/include/sys/Makefile.am
45+++ b/include/sys/Makefile.am
46@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
47 endif
48
49 if CONFIG_KERNEL
50-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
51+kerneldir = @prefix@/include/sys
52 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
53 endif
54diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
55index 8bca5d8..a5eafcd 100644
56--- a/include/sys/fm/Makefile.am
57+++ b/include/sys/fm/Makefile.am
58@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
59 endif
60
61 if CONFIG_KERNEL
62-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
63+kerneldir = @prefix@/include/sys/fm
64 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
65 endif
66diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
67index fdc9eb5..807c47c 100644
68--- a/include/sys/fm/fs/Makefile.am
69+++ b/include/sys/fm/fs/Makefile.am
70@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
71 endif
72
73 if CONFIG_KERNEL
74-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
75+kerneldir = @prefix@/include/sys/fm/fs
76 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
77 endif
78diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
79index 0859b9f..b0c6eec 100644
80--- a/include/sys/fs/Makefile.am
81+++ b/include/sys/fs/Makefile.am
82@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
83 endif
84
85 if CONFIG_KERNEL
86-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
87+kerneldir = @prefix@/include/sys/fs
88 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
89 endif
90diff --git a/module/Makefile.in b/module/Makefile.in
91index 686402b..9cbf598 100644
92--- a/module/Makefile.in
93+++ b/module/Makefile.in
94@@ -18,9 +18,9 @@ modules:
95 @# installed devel headers, or they may be in the module
96 @# subdirectory when building against the spl source tree.
97 @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
98- /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
99+ cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
100 elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
101- /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
102+ cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
103 else \
104 echo -e "\n" \
105 "*** Missing spl symbols ensure you have built the spl:\n" \
106@@ -28,6 +28,8 @@ modules:
107 "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
108 exit 1; \
109 fi
110+ @# when copying a file out of the nix store, we need to make it writable again.
111+ chmod +w @SPL_SYMBOLS@
112 $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
113
114 clean:
115@@ -42,15 +44,15 @@ clean:
116 modules_install:
117 @# Install the kernel modules
118 $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
119- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
120+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
121 INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
122 KERNELRELEASE=@LINUX_VERSION@
123 @# Remove extraneous build products when packaging
124- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
125+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
126 if [ -n $$kmoddir ]; then \
127 find $$kmoddir -name 'modules.*' | xargs $(RM); \
128 fi
129- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
130+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
131 if [ -f $$sysmap ]; then \
132 depmod -ae -F $$sysmap @LINUX_VERSION@; \
133 fi