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
Closes openzfs#13496
Backport-of: openzfs#13503
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
  • Loading branch information
nabijaczleweli committed May 24, 2022
1 parent 0514731 commit b364c95
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions etc/default/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
include $(top_srcdir)/config/Substfiles.am
include $(top_srcdir)/config/Shellcheck.am

initconf_SCRIPTS = zfs
initconf_DATA = zfs

SUBSTFILES += $(initconf_SCRIPTS)
SUBSTFILES += $(initconf_DATA)

SHELLCHECKSCRIPTS = $(initconf_DATA)
SHELLCHECK_SHELL = sh
SHELLCHECK_IGNORE = ,SC2034
5 changes: 3 additions & 2 deletions etc/zfs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ dist_pkgsysconf_DATA = \
vdev_id.conf.multipath.example \
vdev_id.conf.scsi.example

pkgsysconf_SCRIPTS = \
pkgsysconf_DATA = \
zfs-functions

SUBSTFILES += $(pkgsysconf_SCRIPTS)
SUBSTFILES += $(pkgsysconf_DATA)

SHELLCHECKSCRIPTS = $(pkgsysconf_DATA)
SHELLCHECK_SHELL = dash # local variables

0 comments on commit b364c95

Please sign in to comment.