From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 26 Dec 2019 22:01:02 +0000 (+0100)
Subject: Fix installer build
X-Git-Tag: emacs-27.0.90~274
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8aad80d661;p=emacs.git

Fix installer build

* admin/nt/dist-build/build-zips.sh: Ensure that NSIS build always
  uses the actual build number to locate its files.
---

diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
index cff6fdec3e0..d8cbee30754 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -160,23 +160,27 @@ while getopts "36gb:hnsiV:" opt; do
   esac
 done
 
-if [ -z $VERSION ];
+
+## ACTUAL_VERSION is the version declared by emacs
+if [ -z $ACTUAL_VERSION ];
 then
-    VERSION=`
+    ACTUAL_VERSION=`
   sed -n 's/^AC_INIT(GNU Emacs,[	 ]*\([^	 ,)]*\).*/\1/p' < ../../../configure.ac
 `
 fi
 
-if [ -z $VERSION ];
+if [ -z $ACTUAL_VERSION ];
 then
     echo [build] Cannot determine Emacs version
     exit 1
 fi
 
+## VERSION is the version that we want to call Emacs
+VERSION=$ACTUAL_VERSION
+
+
 MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)"
 
-## ACTUAL VERSION is the version declared by emacs
-ACTUAL_VERSION=$VERSION
 
 ## VERSION includes the word snapshot if necessary
 VERSION=$VERSION$SNAPSHOT