From dc921e2bb67c97d6751e4189471053980b9d7872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Wed, 25 May 2022 00:50:33 +0200 Subject: [PATCH] automake: don't distribute /e/d/zfs or /e/z/zfs-functions +x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #13496 Signed-off-by: Ahelenia Ziemiańska --- etc/Makefile.am | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/etc/Makefile.am b/etc/Makefile.am index ffe5fad2b4a9..d4c9f8dab1ea 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -7,28 +7,29 @@ EXTRA_DIST += $(sudoersd_DATA) sysconf_zfsdir = $(sysconfdir)/zfs +ETCZFSSCRIPTS = \ + %D%/zfs/zfs-functions + +SUBSTFILES += $(ETCZFSSCRIPTS) +SHELLCHECKSCRIPTS += $(ETCZFSSCRIPTS) +$(call SHELLCHECK_OPTS,$(ETCZFSSCRIPTS)): SHELLCHECK_SHELL = sh + dist_sysconf_zfs_DATA = \ %D%/zfs/vdev_id.conf.alias.example \ %D%/zfs/vdev_id.conf.multipath.example \ %D%/zfs/vdev_id.conf.sas_direct.example \ %D%/zfs/vdev_id.conf.sas_switch.example \ - %D%/zfs/vdev_id.conf.scsi.example - -sysconf_zfs_SCRIPTS = \ - %D%/zfs/zfs-functions - -SUBSTFILES += $(sysconf_zfs_SCRIPTS) -SHELLCHECKSCRIPTS += $(sysconf_zfs_SCRIPTS) -$(call SHELLCHECK_OPTS,$(sysconf_zfs_SCRIPTS)): SHELLCHECK_SHELL = sh + %D%/zfs/vdev_id.conf.scsi.example \ + $(ETCZFSSCRIPTS) if BUILD_LINUX -initconf_SCRIPTS = \ +dist_initconf_DATA = \ %D%/default/zfs -SUBSTFILES += $(initconf_SCRIPTS) -SHELLCHECKSCRIPTS += $(initconf_SCRIPTS) -$(call SHELLCHECK_OPTS,$(initconf_SCRIPTS)): SHELLCHECK_SHELL = sh +SUBSTFILES += $(dist_initconf_DATA) +SHELLCHECKSCRIPTS += $(dist_initconf_DATA) +$(call SHELLCHECK_OPTS,$(dist_initconf_DATA)): SHELLCHECK_SHELL = sh if INIT_SYSV