From 7bf8bcb3c3da3d097dc9d2e0c7b0f0035d27cdaf Mon Sep 17 00:00:00 2001 From: morriss Date: Tue, 5 Oct 2010 15:33:07 +0000 Subject: 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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34381 f5534014-38df-0310-8fa8-9805f1628bb7 --- Makefile.nmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.nmake') 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. -- cgit v1.2.3