From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 31 May 2019 16:37:38 +0000 (-0700)
Subject: Remove FORCE prerequisite on version.h.
X-Git-Tag: mutt-1-12-1-rel~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22c6df821b95482d0bd6908ee3687ecb0c3e5d33;p=mutt

Remove FORCE prerequisite on version.h.

This is causing package build issues on OpenBSD because of a
difference in make behavior.

In GNU make, it always invoke the 'version.h' target, but then checks
to see if version.h changed before retriggering targets with that
prerequisite.  On OpenBSD, invoking the version.h target always
retriggers targets with that prerequisite.

This means that updating the version information now requires a 'make
clean' or manual removal of version.h.
---

diff --git a/Makefile.am b/Makefile.am
index 8ccaef38..0d6a878f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,10 +140,8 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.PGP $(srcdir
 		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
 			> keymap_alldefs.h
 
-version.h: FORCE
-	echo '#define MUTT_VERSION "'`sh "$(srcdir)/version.sh"`'"' > $@.tmp
-	cmp -s $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@
-FORCE:
+version.h: $(srcdir)/version.sh
+	echo '#define MUTT_VERSION "'`sh "$(srcdir)/version.sh"`'"' > version.h
 
 reldate.h: $(srcdir)/mkreldate.sh $(srcdir)/ChangeLog
 	echo 'const char *ReleaseDate = "'`(cd $(srcdir) && ./mkreldate.sh)`'";' > reldate.h