summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dracut/02zfsexpandknowledge/Makefile.am8
-rw-r--r--contrib/dracut/90zfs/Makefile.am4
-rw-r--r--contrib/pam_zfs_key/Makefile.am3
3 files changed, 3 insertions, 12 deletions
diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am
index 8c2637b60..11f2a84af 100644
--- a/contrib/dracut/02zfsexpandknowledge/Makefile.am
+++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am
@@ -15,10 +15,4 @@ $(pkgdracut_SCRIPTS):%:%.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@'
-# Double-colon rules are allowed; there are multiple independent definitions.
-clean-local::
- -$(RM) $(pkgdracut_SCRIPTS)
-
-# Double-colon rules are allowed; there are multiple independent definitions.
-distclean-local::
- -$(RM) $(pkgdracut_SCRIPTS)
+CLEANFILES = $(pkgdracut_SCRIPTS)
diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
index 5ce757cdf..645808e44 100644
--- a/contrib/dracut/90zfs/Makefile.am
+++ b/contrib/dracut/90zfs/Makefile.am
@@ -37,6 +37,4 @@ $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in
-e 's,@mounthelperdir\@,$(mounthelperdir),g' \
$< >'$@'
-# Double-colon rules are allowed; there are multiple independent definitions.
-distclean-local::
- -$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
+CLEANFILES = $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)
diff --git a/contrib/pam_zfs_key/Makefile.am b/contrib/pam_zfs_key/Makefile.am
index 0f038bb78..7feabcdcb 100644
--- a/contrib/pam_zfs_key/Makefile.am
+++ b/contrib/pam_zfs_key/Makefile.am
@@ -14,5 +14,4 @@ pam_zfs_key_la_LDFLAGS = -version-info 1:0:0 -avoid-version -module -shared
pam_zfs_key_la_LIBADD += -lpam $(LIBSSL)
-pamconfigs_DATA = zfs_key
-EXTRA_DIST = $(pamconfigs_DATA)
+dist_pamconfigs_DATA = zfs_key