aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-10-05 15:33:07 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-10-05 15:33:07 +0000
commit81b5ece966ac611f9878214e1222149b9a614015 (patch)
treef5254c4b87b4fd73879128767462d3585a776c12 /Makefile.nmake
parent5af01ed393f195a002266c89e48e941efebafef2 (diff)
It seems it's quite hard to set and retrieve environment variables in nmake (at least I can't figure it out). So, just cd back to MAKEDIR after cleaning up. This should get the buildbots going again and fix bug 5275.
svn path=/trunk/; revision=34381
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 3fbb3260ff..0d83ee9b8f 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -853,7 +853,6 @@ process_libs:
# WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO
# UPDATING REMOVES THE FORMER USER DIRS
clean_setup:
- set ORIGDIR=%CD%
cd $(WIRESHARK_LIBS)
rm -r -f adns-1.0-win32-05ws
rm -r -f c-ares-1.5.3ws
@@ -895,7 +894,7 @@ clean_setup:
rm -r -f upx303w
rm -r -f GeoIP-1.4.5ws
rm -r -f GeoIP-1.4.6-win??ws
- cd "$(ORIGDIR)"
+ cd $(MAKEDIR)
################################################################################
# Prepare the debug trees for running Wireshark/Tshark from there.