From f021fe194fec75ba1196638ca00301ba3b54ae85 Mon Sep 17 00:00:00 2001 From: Ned Bass Date: Thu, 22 Sep 2011 15:36:42 -0700 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Closes #410 --- etc/init.d/Makefile.am | 2 +- etc/init.d/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am index 94a2168..c1b131b 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 32c73dc..a639233 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) -- 1.8.3.1