summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKevin McCarthy <kevin@8t8.us>2015-07-09 14:50:05 -0700
committerKevin McCarthy <kevin@8t8.us>2015-07-09 14:50:05 -0700
commit32de2adc620a155f6ba90075df2694209fb6f292 (patch)
tree474d41fe82961ebdf845be8fa4c0eeb92aa9ec97 /doc
parent61289d13457b6c80ec97ac0787abea9ca7094aec (diff)
Use $(VAR) instead of @VAR@ in Makefile.am files. (closes #3664)
The @VAR@ form is not overridable, such as the case for #3664 where the reporter wanted to override DOTLOCK_GROUP. It's doubtful targets need to be overriden, but it makes sense to be consistent in the usage of automake substituted variables unless there is a particular reason/bug to work around.
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 25633760..b181cad3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,6 @@ include $(top_srcdir)/flymake.am
subdir = doc
-DSLROOT = @DSLROOT@
-
DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir)
@@ -62,7 +60,7 @@ install-data-local: makedoc-all instdoc
./instdoc pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
- test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
+ test x$(DOTLOCK_TARGET) = x || ./instdoc $(srcdir)/dotlock.man \
$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5