Skip to content

Commit

Permalink
automake: don't install /e/d/zfs or /e/z/zfs-functions +x
Browse files Browse the repository at this point in the history
_SCRIPTS means it's made +x when installing; _DATA is made -x.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13496
Closes openzfs#13503
  • Loading branch information
nabijaczleweli authored and andrewc12 committed Sep 23, 2022
1 parent 7398177 commit ad7da76
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ad7da76

Please sign in to comment.