1 diff --git a/Makefile.am b/Makefile.am
2 index 55cae89fa..8ce1af3b8 100644
5 @@ -9,13 +9,13 @@ if CONFIG_USER
6 SUBDIRS += udev etc man scripts lib tests cmd contrib
10 +SUBDIRS += scripts module
12 extradir = $(prefix)/src/zfs-$(VERSION)
13 -extra_HEADERS = zfs.release.in zfs_config.h.in
14 +extra_HEADERS = zfs.release zfs_config.h
16 kerneldir = $(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION)
17 -nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
18 +nodist_kernel_HEADERS = zfs.release.in zfs_config.h.in module/$(LINUX_SYMBOLS)
21 AUTOMAKE_OPTIONS = foreign
22 @@ -54,8 +54,8 @@ install-data-hook:
23 cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
24 ln -s ../zfs-$(VERSION)/include/spl include && \
25 ln -s ../zfs-$(VERSION)/$(LINUX_VERSION) $(LINUX_VERSION) && \
26 - ln -s ../zfs-$(VERSION)/zfs_config.h.in spl_config.h.in && \
27 - ln -s ../zfs-$(VERSION)/zfs.release.in spl.release.in && \
28 + ln -s ../zfs-$(VERSION)/zfs_config.h spl_config.h && \
29 + ln -s ../zfs-$(VERSION)/zfs.release spl.release && \
30 cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \
31 ln -fs zfs_config.h spl_config.h && \
32 ln -fs zfs.release spl.release
33 --- zfs-0.7.9/config/user-systemd.m4~ 2018-08-17 08:32:52.000000000 +0200
34 +++ zfs-0.7.9/config/user-systemd.m4 2018-08-19 12:08:45.390362052 +0200
36 AC_ARG_WITH(systemdmodulesloaddir,
37 AC_HELP_STRING([--with-systemdmodulesloaddir=DIR],
38 [install systemd module load files into dir [[/usr/lib/modules-load.d]]]),
39 - systemdmoduleloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
40 + systemdmodulesloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
42 AC_ARG_WITH(systemdgeneratordir,
43 AC_HELP_STRING([--with-systemdgeneratordir=DIR],