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 openzfs#10493
ctuffli · Jun 25, 2020 · 7513807 · 7513807
1 parent 5ca349f
commit 7513807
Show file tree

Hide file tree

Showing 38 changed files with 463 additions and 463 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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' \

diff --git a/etc/default/Makefile.am b/etc/default/Makefile.am
@@ -2,7 +2,7 @@ initconfdir = $(DEFAULT_INITCONF_DIR)
 initconf_SCRIPTS = zfs
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/default/zfs.in
+	zfs.in
 
 $(initconf_SCRIPTS):%:%.in Makefile
 	  $(SED) \

diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
@@ -4,10 +4,10 @@ init_SCRIPTS = zfs-import zfs-mount zfs-share zfs-zed
 initconfdir = $(DEFAULT_INITCONF_DIR)
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/init.d/zfs-share.in \
-	$(top_srcdir)/etc/init.d/zfs-import.in \
-	$(top_srcdir)/etc/init.d/zfs-mount.in \
-	$(top_srcdir)/etc/init.d/zfs-zed.in
+	zfs-share.in \
+	zfs-import.in \
+	zfs-mount.in \
+	zfs-zed.in
 
 $(init_SCRIPTS):%:%.in Makefile
 	-(if [ -e /etc/debian_version ]; then \

diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am
@@ -2,7 +2,7 @@ modulesload_DATA = \
 	zfs.conf
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/modules-load.d/zfs.conf.in
+	zfs.conf.in
 
 $(modulesload_DATA):%:%.in
 	-$(SED) \

diff --git a/etc/sudoers.d/Makefile.am b/etc/sudoers.d/Makefile.am
@@ -2,4 +2,4 @@ sudoersddir = $(sysconfdir)/sudoers.d
 sudoersd_DATA = zfs
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/sudoers.d/zfs
+	zfs
diff --git a/etc/systemd/system-generators/Makefile.am b/etc/systemd/system-generators/Makefile.am
@@ -2,7 +2,7 @@ systemdgenerator_SCRIPTS = \
 	zfs-mount-generator
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/systemd/system-generators/zfs-mount-generator.in
+	zfs-mount-generator.in
 
 $(systemdgenerator_SCRIPTS): %: %.in
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \

diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
@@ -13,16 +13,16 @@ systemdunit_DATA = \
 	zfs.target
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/systemd/system/zfs-zed.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-share.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-import.target.in \
-	$(top_srcdir)/etc/systemd/system/zfs-volume-wait.service.in \
-	$(top_srcdir)/etc/systemd/system/zfs-volumes.target.in \
-	$(top_srcdir)/etc/systemd/system/zfs.target.in \
-	$(top_srcdir)/etc/systemd/system/50-zfs.preset.in
+	zfs-zed.service.in \
+	zfs-import-cache.service.in \
+	zfs-import-scan.service.in \
+	zfs-mount.service.in \
+	zfs-share.service.in \
+	zfs-import.target.in \
+	zfs-volume-wait.service.in \
+	zfs-volumes.target.in \
+	zfs.target.in \
+	50-zfs.preset.in
 
 $(systemdunit_DATA) $(systemdpreset_DATA):%:%.in
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -1,24 +1,24 @@
 SUBDIRS = sys os
 
 COMMON_H = \
-	$(top_srcdir)/include/cityhash.h \
-	$(top_srcdir)/include/zfeature_common.h \
-	$(top_srcdir)/include/zfs_comutil.h \
-	$(top_srcdir)/include/zfs_deleg.h \
-	$(top_srcdir)/include/zfs_fletcher.h \
-	$(top_srcdir)/include/zfs_namecheck.h \
-	$(top_srcdir)/include/zfs_prop.h
+	cityhash.h \
+	zfeature_common.h \
+	zfs_comutil.h \
+	zfs_deleg.h \
+	zfs_fletcher.h \
+	zfs_namecheck.h \
+	zfs_prop.h
 
 USER_H = \
-	$(top_srcdir)/include/libnvpair.h \
-	$(top_srcdir)/include/libuutil_common.h \
-	$(top_srcdir)/include/libuutil.h \
-	$(top_srcdir)/include/libuutil_impl.h \
-	$(top_srcdir)/include/libzfs.h \
-	$(top_srcdir)/include/libzfs_core.h \
-	$(top_srcdir)/include/libzfs_impl.h \
-	$(top_srcdir)/include/libzutil.h \
-	$(top_srcdir)/include/thread_pool.h
+	libnvpair.h \
+	libuutil_common.h \
+	libuutil.h \
+	libuutil_impl.h \
+	libzfs.h \
+	libzfs_core.h \
+	libzfs_impl.h \
+	libzutil.h \
+	thread_pool.h
 
 EXTRA_DIST = $(COMMON_H) $(USER_H)
 

diff --git a/include/os/freebsd/linux/Makefile.am b/include/os/freebsd/linux/Makefile.am
@@ -1,5 +1,5 @@
 KERNEL_H = \
-	$(top_srcdir)/include/os/freebsd/linux/compiler.h \
-	$(top_srcdir)/include/os/freebsd/linux/types.h
+	compiler.h \
+	types.h
 
 EXTRA_DIST = $(KERNEL_H)
diff --git a/include/os/freebsd/spl/acl/Makefile.am b/include/os/freebsd/spl/acl/Makefile.am
@@ -1,4 +1,4 @@
 KERNEL_H = \
-	$(top_srcdir)/include/os/freebsd/spl/acl/acl_common.h
+	acl_common.h
 
 EXTRA_DIST = $(KERNEL_H)
diff --git a/include/os/freebsd/spl/rpc/Makefile.am b/include/os/freebsd/spl/rpc/Makefile.am
@@ -1,7 +1,7 @@
 COMMON_H =
 
 KERNEL_H = \
-	$(top_srcdir)/include/os/freebsd/spl/rpc/xdr.h
+	xdr.h
 
 USER_H =
 

diff --git a/include/os/freebsd/spl/sys/Makefile.am b/include/os/freebsd/spl/sys/Makefile.am
@@ -1,72 +1,72 @@
 KERNEL_H = \
-	$(top_srcdir)/include/os/freebsd/spl/sys/acl_impl.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/acl.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/atomic.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/byteorder.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/callb.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/ccompile.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/cmn_err.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/condvar.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/console.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/cred.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/ctype.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/debug.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/dirent.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/disp.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/dkio.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/endian.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/extdirent.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/file.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/freebsd_rwlock.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/inttypes.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/isa_defs.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/kmem_cache.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/kmem.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/kstat.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/list_impl.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/list.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/lock.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/Makefile.am \
-	$(top_srcdir)/include/os/freebsd/spl/sys/misc.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/mod_os.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/mode.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/mount.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/mutex.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/param.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/policy.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/proc.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/processor.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/procfs_list.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/random.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/rwlock.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/sdt.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/sid.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/sig.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/simd_x86.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/simd.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/spl_condvar.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/string.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/strings.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/sunddi.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/sysmacros.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/systeminfo.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/systm.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/taskq.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/thread.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/time.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/timer.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/trace_zfs.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/trace.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/types.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/types32.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/uio.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/uuid.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/vfs.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/vm.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/vmsystm.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/vnode_impl.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/vnode.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/zmod.h \
-	$(top_srcdir)/include/os/freebsd/spl/sys/zone.h
+	acl_impl.h \
+	acl.h \
+	atomic.h \
+	byteorder.h \
+	callb.h \
+	ccompile.h \
+	cmn_err.h \
+	condvar.h \
+	console.h \
+	cred.h \
+	ctype.h \
+	debug.h \
+	dirent.h \
+	disp.h \
+	dkio.h \
+	endian.h \
+	extdirent.h \
+	file.h \
+	freebsd_rwlock.h \
+	inttypes.h \
+	isa_defs.h \
+	kmem_cache.h \
+	kmem.h \
+	kstat.h \
+	list_impl.h \
+	list.h \
+	lock.h \
+	Makefile.am \
+	misc.h \
+	mod_os.h \
+	mode.h \
+	mount.h \
+	mutex.h \
+	param.h \
+	policy.h \
+	proc.h \
+	processor.h \
+	procfs_list.h \
+	random.h \
+	rwlock.h \
+	sdt.h \
+	sid.h \
+	sig.h \
+	simd_x86.h \
+	simd.h \
+	spl_condvar.h \
+	string.h \
+	strings.h \
+	sunddi.h \
+	sysmacros.h \
+	systeminfo.h \
+	systm.h \
+	taskq.h \
+	thread.h \
+	time.h \
+	timer.h \
+	trace_zfs.h \
+	trace.h \
+	types.h \
+	types32.h \
+	uio.h \
+	uuid.h \
+	vfs.h \
+	vm.h \
+	vmsystm.h \
+	vnode_impl.h \
+	vnode.h \
+	zmod.h \
+	zone.h
 
 EXTRA_DIST = $(KERNEL_H)
diff --git a/include/os/freebsd/zfs/sys/Makefile.am b/include/os/freebsd/zfs/sys/Makefile.am
@@ -1,14 +1,14 @@
 KERNEL_H = \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/freebsd_crypto.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/sha2.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/vdev_os.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_context_os.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_ctldir.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_dir.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_ioctl_compat.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_vfsops.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_vnops.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zfs_znode_impl.h \
-	$(top_srcdir)/include/os/freebsd/zfs/sys/zpl.h
+	freebsd_crypto.h \
+	sha2.h \
+	vdev_os.h \
+	zfs_context_os.h \
+	zfs_ctldir.h \
+	zfs_dir.h \
+	zfs_ioctl_compat.h \
+	zfs_vfsops.h \
+	zfs_vnops.h \
+	zfs_znode_impl.h \
+	zpl.h
 
 EXTRA_DIST = $(KERNEL_H)