From c15f4303afab7564c2c7915d48853e4226c4aa64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Wed, 25 May 2022 18:29:47 +0200 Subject: [PATCH] automake: don't install /e/d/zfs or /e/z/zfs-functions +x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit _SCRIPTS means it's made +x when installing; _DATA is made -x. Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13496 Closes #13503 --- etc/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/Makefile.am b/etc/Makefile.am index ffe5fad2b4a9..a41f04c90420 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -14,21 +14,21 @@ dist_sysconf_zfs_DATA = \ %D%/zfs/vdev_id.conf.sas_switch.example \ %D%/zfs/vdev_id.conf.scsi.example -sysconf_zfs_SCRIPTS = \ +sysconf_zfs_DATA = \ %D%/zfs/zfs-functions -SUBSTFILES += $(sysconf_zfs_SCRIPTS) -SHELLCHECKSCRIPTS += $(sysconf_zfs_SCRIPTS) -$(call SHELLCHECK_OPTS,$(sysconf_zfs_SCRIPTS)): SHELLCHECK_SHELL = sh +SUBSTFILES += $(sysconf_zfs_DATA) +SHELLCHECKSCRIPTS += $(sysconf_zfs_DATA) +$(call SHELLCHECK_OPTS,$(sysconf_zfs_DATA)): SHELLCHECK_SHELL = sh if BUILD_LINUX -initconf_SCRIPTS = \ +initconf_DATA = \ %D%/default/zfs -SUBSTFILES += $(initconf_SCRIPTS) -SHELLCHECKSCRIPTS += $(initconf_SCRIPTS) -$(call SHELLCHECK_OPTS,$(initconf_SCRIPTS)): SHELLCHECK_SHELL = sh +SUBSTFILES += $(initconf_DATA) +SHELLCHECKSCRIPTS += $(initconf_DATA) +$(call SHELLCHECK_OPTS,$(initconf_DATA)): SHELLCHECK_SHELL = sh if INIT_SYSV