commit 514e460ca892b846e6a082de2e3c9f0d27eb4539
author Grant Erickson <grant@nestlabs.com> Tue Oct 09 16:03:37 2018 -0700
committer Grant Erickson <grant@nestlabs.com> Tue Oct 09 16:03:37 2018 -0700
tree 1d68ab1dd22c9174f1e74abd75ac9794ace6db37
parent 90e0077d2a10c2c185bd1e4b6255c697845b489b

Don't export WEAVE_VERSION since that negatively impacts .local-version.

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 440283e..094138c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,7 +123,7 @@
 # flapping as VERSION_FILE changes.
 #
 
-export WEAVE_VERSION              ?= $(shell cat $(VERSION_FILE) 2> /dev/null)
+WEAVE_VERSION                     ?= $(if $(filter 0,$(MAKELEVEL)),$(shell cat $(VERSION_FILE) 2> /dev/null),$(WEAVE_VERSION))
 
 PACKAGE_VERSION                    = $(WEAVE_VERSION)
 VERSION                            = $(PACKAGE_VERSION)

Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 15a8598..e9a6f26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1223,7 +1223,7 @@
 # flapping as VERSION_FILE changes.
 #
 
-export WEAVE_VERSION              ?= $(shell cat $(VERSION_FILE) 2> /dev/null)
+WEAVE_VERSION                     ?= $(if $(filter 0,$(MAKELEVEL)),$(shell cat $(VERSION_FILE) 2> /dev/null),$(WEAVE_VERSION))
 
 $(warning origin of MAKECMDGOALS is $(origin MAKECMDGOALS))
 $(warning MAKECMDGOALS is $(MAKECMDGOALS))