changeset: 6463:7e91a8855dc3
user: Kevin McCarthy <[email protected]>
date: Thu Jul 09 14:50:05 2015 -0700
link: http://dev.mutt.org/hg/mutt/rev/7e91a8855dc3
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.
diffs (115 lines):
diff -r 79cd2f34961d -r 7e91a8855dc3 Makefile.am
--- a/Makefile.am Sun Jul 05 13:38:39 2015 -0700
+++ b/Makefile.am Thu Jul 09 14:50:05 2015 -0700
@@ -12,7 +12,7 @@
SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
if BUILD_HCACHE
HCVERSION = hcversion.h
@@ -20,7 +20,7 @@
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
+bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
mutt_SOURCES = \
addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
crypt.c cryptglue.c \
@@ -38,10 +38,10 @@
nodist_mutt_SOURCES = $(BUILT_SOURCES)
-mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
$(INTLLIBS) $(LIBICONV) $(GPGME_LIBS)
-mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
$(INTLDEPS)
DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -50,8 +50,6 @@
AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(GPGME_CFLAGS) -Iintl
-CPPFLAGS=@CPPFLAGS@
-
EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \
crypt-mod-pgp-gpgme.c crypt-mod-smime-classic.c \
crypt-mod-smime-gpgme.c dotlock.c gnupgparse.c hcache.c md5.c \
@@ -80,12 +78,12 @@
EXTRA_SCRIPTS = smime_keys
mutt_dotlock_SOURCES = mutt_dotlock.c
-mutt_dotlock_LDADD = @LIBOBJS@
-mutt_dotlock_DEPENDENCIES = @LIBOBJS@
+mutt_dotlock_LDADD = $(LIBOBJS)
+mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c
pgppacket.c ascii.c
-pgpring_LDADD = @LIBOBJS@ $(INTLLIBS)
-pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+pgpring_LDADD = $(LIBOBJS) $(INTLLIBS)
+pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
mutt_md5_SOURCES = md5.c
mutt_md5_CFLAGS = -DMD5UTIL
@@ -119,7 +117,7 @@
ACLOCAL_AMFLAGS = -I m4
-LDADD = @LIBOBJS@ @INTLLIBS@
+LDADD = $(LIBOBJS) $(INTLLIBS)
flea: muttbug.sh
cp muttbug.sh flea
@@ -155,9 +153,9 @@
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock
$(DESTDIR)$(bindir)/mutt.dotlock ; \
fi
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ !=
x ; then \
- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
+ if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP)
!= x ; then \
+ chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+ chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock ||
\
{ echo "Can't fix mutt_dotlock's permissions! This is required
to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
fi
diff -r 79cd2f34961d -r 7e91a8855dc3 doc/Makefile.am
--- a/doc/Makefile.am Sun Jul 05 13:38:39 2015 -0700
+++ b/doc/Makefile.am Thu Jul 09 14:50:05 2015 -0700
@@ -2,8 +2,6 @@
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 @@
./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
diff -r 79cd2f34961d -r 7e91a8855dc3 imap/Makefile.am
--- a/imap/Makefile.am Sun Jul 05 13:38:39 2015 -0700
+++ b/imap/Makefile.am Thu Jul 09 14:50:05 2015 -0700
@@ -1,8 +1,6 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/flymake.am
-AR=@AR@
-
AUTOMAKE_OPTIONS = 1.6 foreign
if USE_GSS
