From: наб <nabijaczleweli@nabijaczleweli.xyz>
Date: Wed, 25 May 2022 16:29:47 +0000 (+0200)
Subject: automake: don't install /e/d/zfs or /e/z/zfs-functions +x
X-Git-Tag: zfs-2.2.0~931
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1d89b989c15acdc9d70878253d68162c3c5c5836;p=mirror_zfs.git

automake: don't install /e/d/zfs or /e/z/zfs-functions +x

_SCRIPTS means it's made +x when installing; _DATA is made -x.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13496
Closes #13503
---

diff --git a/etc/Makefile.am b/etc/Makefile.am
index ffe5fad2b..a41f04c90 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