]> git.proxmox.com Git - mirror_zfs.git/commitdiff
automake: don't install /e/d/zfs or /e/z/zfs-functions +x
authorнаб <nabijaczleweli@nabijaczleweli.xyz>
Wed, 25 May 2022 16:29:47 +0000 (18:29 +0200)
committerGitHub <noreply@github.com>
Wed, 25 May 2022 16:29:47 +0000 (09:29 -0700)
_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

etc/Makefile.am

index ffe5fad2b4a929d5433d949753206a73739b42dc..a41f04c90420ece90b417c088c909f47a9b413ec 100644 (file)
@@ -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