Wireshark-dev: [Wireshark-dev] Packaging: Let MAKEDIR in quotation marks

From: Mi Jinlong <kinglongmee@xxxxxxxxx>
Date: Tue, 23 Oct 2012 16:48:45 +0800
Hi guys, 

I got error running nmake,

#nmake -f Makefile.nmake packaging
... ...
"C:\Program Files\NSIS\makensis.exe"  /DPROGRAM_NAME=wireshark
/DMAKEDIR=C:\Documents and Settings\Administrator\test\wireshark\packaging\nsis
... ...
Command line defined: "PROGRAM_NAME=wireshark"
Command line defined: "MAKEDIR=C:\Documents"
... ...
Can't open script "and"
NMAKE : fatal error U1077: '"C:\Program Files\NSIS\makensis.exe"' : return
code'0x1'Stop.
NMAKE : fatal error U1077: '"C:\Program Files\Microsoft Visual Studio
10.0\VC\BIN\nmake.exe"' : return code '0x2' Stop.
--

The following patch can work correctly, corresponding bugzilla is,
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7870

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 487da70..3939a0f 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -90,7 +90,7 @@ user-guide.chm::
 
 NSIS_FLAGS=\
 	/DPROGRAM_NAME=$(PROGRAM_NAME) \
-	/DMAKEDIR=$(MAKEDIR) \
+	/DMAKEDIR="$(MAKEDIR)" \
 	/DSTAGING_DIR=$(STAGING_DIR) \
 	/DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \
 	/DTARGET_MACHINE=$(TARGET_MACHINE) \
-- 
1.7.1