diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-05-28 23:20:20 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-05-28 23:20:20 +0000 |
| commit | 96505bc99dfdf0d572f0434d8e9222c42024c2e0 (patch) | |
| tree | 950ac39e1af6541b9b76916b2b8f1b7460326142 /tools/win32-setup.sh | |
| parent | 49ff735599e92f71fee2553cf27b4e11615568fc (diff) | |
Version 2: Fix bug: Makefile doesn't detect some out-of-date libraries.
The previous fix (SVN 28504) didn't quite work since
nmake always errored out if the libraries were not up-to-date; this
prevented doing an nmake ... setup.
This version of the fix:
1. Gets the library status (checktag) at the beginning of the make.
2. Effectively does the actual testing of the status whenever
a target with $(LIBS_CHECK) as a dependency is invoked.
Result: nmake ... [all] will error-out while nmake .... setup will
work properly.
Note that nmake ... setup will now show an initial error message
(from checktag) if the libraries are out of date; setup will still
proceed normally.
This is a slight change from the current behavior wherein no
error message occurs when nmake ... setup is invoked when the
libraries are out of date.
svn path=/trunk/; revision=28516
Diffstat (limited to 'tools/win32-setup.sh')
| -rwxr-xr-x | tools/win32-setup.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 4f2cfd718a..71fb0f8e72 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -169,8 +169,7 @@ case "$1" in fi err_exit \ "The contents of $WIN_PATH\\$TAG_FILE is $LAST_TAG." \ - "It should be $DOWNLOAD_TAG." \ - "Do you need to run \"nmake -f makefile.nmake setup\"?" + "It should be $DOWNLOAD_TAG." fi ;; *) |