summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Bass <[email protected]>2011-09-22 15:36:42 -0700
committerBrian Behlendorf <[email protected]>2011-09-26 09:22:30 -0700
commitf021fe194fec75ba1196638ca00301ba3b54ae85 (patch)
tree6611bcd28aad78710c6f09f5fe22758e0478d4d7
parentfa6e5ced2fba92555019c7bc09b4c4b98c1a5323 (diff)
Use automatic variable in Makefile
As written, the $(init_SCRIPTS) rule in etc/init.d/Makefule.am would not work as expected if the init_SCRIPTS variable were to contain any elements other than zfs. Fix this by replacing the hard-coded 'zfs' reference with $@. Signed-off-by: Ned Bass <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #410
-rw-r--r--etc/init.d/Makefile.am2
-rw-r--r--etc/init.d/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
index 94a21680b..c1b131bcb 100644
--- a/etc/init.d/Makefile.am
+++ b/etc/init.d/Makefile.am
@@ -16,7 +16,7 @@ $(init_SCRIPTS):
-e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@initdir\@,$(initdir),g' \
- 'zfs.$(DEFAULT_INIT_SCRIPT).in' >'$@'
+ '$@.$(DEFAULT_INIT_SCRIPT).in' >'$@'
distclean-local::
-$(RM) $(init_SCRIPTS)
diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in
index 32c73dc9e..a639233a1 100644
--- a/etc/init.d/Makefile.in
+++ b/etc/init.d/Makefile.in
@@ -531,7 +531,7 @@ $(init_SCRIPTS):
-e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@initdir\@,$(initdir),g' \
- 'zfs.$(DEFAULT_INIT_SCRIPT).in' >'$@'
+ '$@.$(DEFAULT_INIT_SCRIPT).in' >'$@'
distclean-local::
-$(RM) $(init_SCRIPTS)