diff options
| author | Tom Prince <[email protected]> | 2014-10-09 14:22:59 -0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-10-09 12:03:50 -0700 |
| commit | fee48fd22c76f30796f524749e5be7b92ed2eda5 (patch) | |
| tree | 7bb8b90368d8d94947aadd4454a0ee38348e628e | |
| parent | 971808ec9f62bc3f8e0347ebace6a19429d4e61d (diff) | |
Install header during post-build rather than post-install.
New versions of dkms clean up the build directory after installing.
It appears that this was always intended, but had rm -rf "/path/to/build/*"
(note the quotes), which prevented it from working.
Also, the build step is already installing stuff into the directory where
these files go, so installing our stuff there as part of build rather than
install makes sense.
Signed-off-by: Tom Prince <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2776
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/dkms.mkconf | 2 | ||||
| -rwxr-xr-x | scripts/dkms.postbuild (renamed from scripts/dkms.postinst) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7894db49e..6869aa67c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = zpool-config zpios-test zpios-profile -EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool zfs2zol-patch.sed cstyle.pl +EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl pkgdatadir = $(datadir)/@PACKAGE@ dist_pkgdata_SCRIPTS = \ diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf index ecdee717f..dde8ee8cb 100755 --- a/scripts/dkms.mkconf +++ b/scripts/dkms.mkconf @@ -47,7 +47,7 @@ PRE_BUILD="configure } ) " -POST_INSTALL="scripts/dkms.postinst +POST_BUILD="scripts/dkms.postbuild -n \${PACKAGE_NAME} -v \${PACKAGE_VERSION} -a \${arch} diff --git a/scripts/dkms.postinst b/scripts/dkms.postbuild index 3cbc7c7ce..3cbc7c7ce 100755 --- a/scripts/dkms.postinst +++ b/scripts/dkms.postbuild |