# HG changeset patch # User Kevin Bullock # Date 1502414702 14400 # Node ID 8de8f8a91f2d8fc84733896d3a7056f974a99e04 # Parent 1814ca418b3043c4c724dbd39a6c94825adbe549 osx: delay version computation on macOS builds Before this patch, HGVER would be evaluated at the beginning of the make execution, and would be unset because build/mercurial/ doesn't exist yet at that point. Now we compute the version after the `make install` run has completed. This is backported to stable from 8626b44516c1, but that revision had an error in the shell invocation syntax. diff -r 1814ca418b30 -r 8de8f8a91f2d Makefile --- a/Makefile Thu Aug 10 20:47:19 2017 -0700 +++ b/Makefile Thu Aug 10 21:25:02 2017 -0400 @@ -186,7 +186,7 @@ PREFIX=/usr/local \ clean install mkdir -p $${OUTPUTDIR:-dist} - HGVER=$(shell python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py ) && \ + HGVER=$$(python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py) && \ OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ pkgbuild --filter \\.DS_Store --root build/mercurial/ \ --identifier org.mercurial-scm.mercurial \