diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/init.d/Makefile.am | 3 | ||||
| -rw-r--r-- | etc/modules-load.d/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/systemd/system-generators/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/systemd/system/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/zfs/Makefile.am | 21 |
5 files changed, 9 insertions, 27 deletions
diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index c40975df5..f97459803 100644 --- a/etc/init.d/Makefile.am +++ b/etc/init.d/Makefile.am @@ -7,7 +7,8 @@ EXTRA_DIST = \ zfs-share.in \ zfs-import.in \ zfs-mount.in \ - zfs-zed.in + zfs-zed.in \ + README.md $(init_SCRIPTS):%:%.in Makefile -(if [ -e /etc/debian_version ]; then \ diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am index 02d9b734a..1c1f8458a 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -9,6 +9,4 @@ $(modulesload_DATA):%:%.in -e '' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(modulesload_DATA) +CLEANFILES = $(modulesload_DATA) diff --git a/etc/systemd/system-generators/Makefile.am b/etc/systemd/system-generators/Makefile.am index 946f798c1..1a3efce32 100644 --- a/etc/systemd/system-generators/Makefile.am +++ b/etc/systemd/system-generators/Makefile.am @@ -11,6 +11,4 @@ $(systemdgenerator_SCRIPTS): %: %.in -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(systemdgenerator_SCRIPTS) +CLEANFILES = $(systemdgenerator_SCRIPTS) diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am index 8ffb14a38..6476fb1bd 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -35,6 +35,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service" -# Double-colon rules are allowed; there are multiple independent definitions. -distclean-local:: - -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) +CLEANFILES = $(systemdunit_DATA) $(systemdpreset_DATA) diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am index 5370f41bd..8e44affaa 100644 --- a/etc/zfs/Makefile.am +++ b/etc/zfs/Makefile.am @@ -1,7 +1,7 @@ pkgsysconfdir = $(sysconfdir)/zfs initconfdir = $(DEFAULT_INITCONF_DIR) -pkgsysconf_DATA = \ +dist_pkgsysconf_DATA = \ vdev_id.conf.alias.example \ vdev_id.conf.sas_direct.example \ vdev_id.conf.sas_switch.example \ @@ -10,26 +10,13 @@ pkgsysconf_DATA = \ pkgsysconf_SCRIPTS = \ zfs-functions -EXTRA_DIST = $(pkgsysconf_DATA) \ - zfs-functions.in +EXTRA_DIST = zfs-functions.in $(pkgsysconf_SCRIPTS):%:%.in Makefile - -(if [ -e /etc/debian_version ]; then \ - NFS_SRV=nfs-kernel-server; \ - else \ - NFS_SRV=nfs; \ - fi; \ - if [ -e /sbin/openrc-run ]; then \ - SHELL=/sbin/openrc-run; \ - else \ - SHELL=/bin/sh; \ - fi; \ - $(SED) \ + -$(SED) \ -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@initconfdir\@,$(initconfdir),g' \ - $< >'$@'; \ - [ '$@' = 'zfs-functions' ] || \ - chmod +x '$@') + $< >'$@' CLEANFILES = $(pkgsysconf_SCRIPTS) |