diff options
author | Arvind Sankar <[email protected]> | 2020-06-22 17:30:40 -0400 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2020-06-24 18:20:18 -0700 |
commit | 75138073208674967d0fb238f1b6210da224db36 (patch) | |
tree | f145d24bcc6be2c9aea039675cf276a9d7959f5b /contrib | |
parent | 5ca349f95d836a2a59aceaa42715349749a43865 (diff) |
Drop unnecessary srcdir paths
There's no need to specify the srcdir explicitly in _HEADERS and
EXTRA_DIST.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10493
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/bpftrace/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/dracut/02zfsexpandknowledge/Makefile.am | 2 | ||||
-rw-r--r-- | contrib/dracut/90zfs/Makefile.am | 22 | ||||
-rw-r--r-- | contrib/initramfs/Makefile.am | 2 | ||||
-rw-r--r-- | contrib/initramfs/hooks/Makefile.am | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/contrib/bpftrace/Makefile.am b/contrib/bpftrace/Makefile.am index c4359e6c8..327bc6442 100644 --- a/contrib/bpftrace/Makefile.am +++ b/contrib/bpftrace/Makefile.am @@ -1,3 +1,3 @@ EXTRA_DIST = \ - $(top_srcdir)/contrib/bpftrace/taskqlatency.bt \ - $(top_srcdir)/contrib/bpftrace/zfs-trace.sh + taskqlatency.bt \ + zfs-trace.sh diff --git a/contrib/dracut/02zfsexpandknowledge/Makefile.am b/contrib/dracut/02zfsexpandknowledge/Makefile.am index 6e553e8d4..8c2637b60 100644 --- a/contrib/dracut/02zfsexpandknowledge/Makefile.am +++ b/contrib/dracut/02zfsexpandknowledge/Makefile.am @@ -3,7 +3,7 @@ pkgdracut_SCRIPTS = \ module-setup.sh EXTRA_DIST = \ - $(top_srcdir)/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in + module-setup.sh.in $(pkgdracut_SCRIPTS):%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index 08667a134..5ce757cdf 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -15,17 +15,17 @@ pkgdracut_DATA = \ zfs-rollback-bootfs.service EXTRA_DIST = \ - $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-load-key.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-needshutdown.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-env-bootfs.service.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-snapshot-bootfs.service.in \ - $(top_srcdir)/contrib/dracut/90zfs/zfs-rollback-bootfs.service.in + export-zfs.sh.in \ + module-setup.sh.in \ + mount-zfs.sh.in \ + parse-zfs.sh.in \ + zfs-generator.sh.in \ + zfs-load-key.sh.in \ + zfs-needshutdown.sh.in \ + zfs-lib.sh.in \ + zfs-env-bootfs.service.in \ + zfs-snapshot-bootfs.service.in \ + zfs-rollback-bootfs.service.in $(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am index ee17de096..5eac6e215 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -6,4 +6,4 @@ dist_initrd_SCRIPTS = \ SUBDIRS = conf.d conf-hooks.d hooks scripts EXTRA_DIST = \ - $(top_srcdir)/contrib/initramfs/README.initramfs.markdown + README.initramfs.markdown diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am index 9b20c080a..8da1c4835 100644 --- a/contrib/initramfs/hooks/Makefile.am +++ b/contrib/initramfs/hooks/Makefile.am @@ -5,8 +5,8 @@ hooks_SCRIPTS = \ zfsunlock EXTRA_DIST = \ - $(top_srcdir)/contrib/initramfs/hooks/zfs.in \ - $(top_srcdir)/contrib/initramfs/hooks/zfsunlock.in + zfs.in \ + zfsunlock.in $(hooks_SCRIPTS):%:%.in Makefile -$(SED) -e 's,@sbindir\@,$(sbindir),g' \ |