From fee48fd22c76f30796f524749e5be7b92ed2eda5 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 9 Oct 2014 14:22:59 -0300 Subject: [PATCH] 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 Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #2776 --- scripts/Makefile.am | 2 +- scripts/dkms.mkconf | 2 +- scripts/{dkms.postinst => dkms.postbuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{dkms.postinst => dkms.postbuild} (100%) 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 similarity index 100% rename from scripts/dkms.postinst rename to scripts/dkms.postbuild