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 <tom.prince@clusterhq.com>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2776

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7894db49e1489d2fe66995b56184f64a9e82b7c7..6869aa67c57e64a14a152bd5400f2ea90486ed3f 100644 (file)
--- 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 ecdee717f60aa18407c0f41f82a49fa7ac73966c..dde8ee8cba5de32c704b8e4f749bf6e234f92ee6 100755 (executable)
--- 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
similarity index 100%
rename from scripts/dkms.postinst
rename to scripts/dkms.postbuild