diff options
| author | Chunwei Chen <[email protected]> | 2016-07-29 16:35:33 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-08-02 10:28:29 -0700 |
| commit | 5b1bc1a1d8ae284f834f239ab0309c6ce96ab74f (patch) | |
| tree | 78855bdd7f842bc76120aac609df33cf29610857 /etc | |
| parent | b64e02e5805e84dcaa4b0820b555b9f90aa5afea (diff) | |
Set proper dependency for string replacement targets
A lot of string replacement target don't have dependency or incorrect
dependency. We setup proper dependency by pattern rules.
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4908
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/init.d/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/modules-load.d/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/systemd/system/Makefile.am | 11 |
3 files changed, 6 insertions, 13 deletions
diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index c6e29d1a5..247db0aba 100644 --- a/etc/init.d/Makefile.am +++ b/etc/init.d/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ $(top_srcdir)/etc/init.d/zfs-zed.in \ $(top_srcdir)/etc/init.d/zfs.in -$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST) +$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in -(if [ -e /etc/debian_version ]; then \ NFS_SRV=nfs-kernel-server; \ else \ @@ -36,7 +36,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST) -e 's,@runstatedir\@,$(runstatedir),g' \ -e "s,@SHELL\@,$$SHELL,g" \ -e "s,@NFS_SRV\@,$$NFS_SRV,g" \ - "$(top_srcdir)/etc/init.d/[email protected]" >'$@'; \ + $< >'$@'; \ [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \ chmod +x '$@') diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am index a6780e1f0..58c7acd44 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -4,10 +4,10 @@ modulesload_DATA = \ EXTRA_DIST = \ $(top_srcdir)/etc/modules-load.d/zfs.conf.in -$(modulesload_DATA): +$(modulesload_DATA):%:%.in -$(SED) \ -e '' \ - "$(top_srcdir)/etc/modules-load.d/[email protected]" >'$@' + $< >'$@' distclean-local:: -$(RM) $(modulesload_DATA) diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am index f7023dff0..b097497e0 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -18,19 +18,12 @@ EXTRA_DIST = \ $(top_srcdir)/etc/systemd/system/zfs.target.in \ $(top_srcdir)/etc/systemd/system/50-zfs.preset.in -$(systemdunit_DATA): +$(systemdunit_DATA) $(systemdpreset_DATA):%:%.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ -e 's,@runstatedir\@,$(runstatedir),g' \ -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ - "$(top_srcdir)/etc/systemd/system/[email protected]" >'$@' - -$(systemdpreset_DATA): - -$(SED) -e 's,@bindir\@,$(bindir),g' \ - -e 's,@runstatedir\@,$(runstatedir),g' \ - -e 's,@sbindir\@,$(sbindir),g' \ - -e 's,@sysconfdir\@,$(sysconfdir),g' \ - "$(top_srcdir)/etc/systemd/system/[email protected]" >'$@' + $< >'$@' distclean-local:: -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) |