From 9951498e63629357ff6f59ebae4f9f5264767bba Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 5 Feb 2007 08:02:01 +0000 Subject: [PATCH 1/1] Fix errors in $(Makeargs) which only occur when building development snapshots. [originally from svn r7220] --- Buildscr | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Buildscr b/Buildscr index eabd159f..6c01b2e8 100644 --- a/Buildscr +++ b/Buildscr @@ -2,9 +2,10 @@ # Build script to construct a full distribution directory of PuTTY. # Set up the arguments for the main make command. -set Makeargs VER="-DSVN_REV=$(revision)" -ifneq "$(RELEASE)" "" set Makeargs $(Makeargs) VER="-DRELEASE=$(RELEASE)" -ifneq "$(date)" "" set Makeargs $(Makeargs) VER="-DSNAPSHOT=$(date)" +set Makever -DSVN_REV=$(revision) +ifneq "$(RELEASE)" "" set Makever $(Makever) -DRELEASE=$(RELEASE) +ifneq "$(date)" "" set Makever $(Makever) -DSNAPSHOT=$(date) +set Makeargs VER="$(Makever)" ifneq "$(XFLAGS)" "" set Makeargs $(makeargs) XFLAGS="$(XFLAGS)" ifneq "$(MAKEARGS)" "" set Makeargs $(makeargs) $(MAKEARGS) @@ -46,7 +47,7 @@ in putty/windows do perl -i~ -pe 'BEGIN{$$a=shift@ARGV;$$a=~s/M//;}s/^(VersionIn delegate windows # FIXME: Cygwin alternative? - in putty/windows do cmd /c 'vcvars32 & nmake -f Makefile.vc $(Makeargs)' + in putty/windows do cmd /c vcvars32 \& nmake -f Makefile.vc $(Makeargs) # Ignore exit code from hhc, in favour of seeing whether the .chm # file was created. (Yuck; but hhc appears to return non-zero # exit codes on whim.) -- 2.45.2