diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-10-28 18:12:52 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-10-28 18:12:52 +0000 |
| commit | 851915356781f8bf453bf2b54e97a3aff1fad781 (patch) | |
| tree | 2d79c0153d174a5b05178a6d5df83bf01ba80932 /packaging/u3 | |
| parent | 488ca683adb56c224eb34c7218068a4b15447aef (diff) | |
| download | wireshark-851915356781f8bf453bf2b54e97a3aff1fad781.tar.gz | |
Small fixes:
1. wireshark.bat: Quote %U3_HOST_EXEC_PATH%\wireshark.exe so pathname
with spaces will work;
2. makefile.nmake: Use $(MAKE) /$(MAKEFLAGS) so things like
invoking nmake at the top level with /E to have environment
variables override config.namke definitions will work.
svn path=/trunk/; revision=23297
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 | ||||
| -rwxr-xr-x | packaging/u3/win32/wireshark.bat | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index bb9047564f..a92d627246 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -27,7 +27,7 @@ all: package uuid.sed: $(TOPDIR)\config.nmake cd $(TOOLSDIR) - nmake -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f makefile.nmake cd ..\win32 $(TOOLSDIR)\utest.exe "$(VERSION)" > $@ @@ -69,7 +69,7 @@ manifest-dirs: user-guide.chm: cd ../../nsis - nmake -f Makefile.nmake user-guide.chm + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm cd ../u3/win32 distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util.exe user-guide.chm wireshark.bat diff --git a/packaging/u3/win32/wireshark.bat b/packaging/u3/win32/wireshark.bat index f93f53bfc8..5df30b40ea 100755 --- a/packaging/u3/win32/wireshark.bat +++ b/packaging/u3/win32/wireshark.bat @@ -41,4 +41,4 @@ SET U3_DEVICE_EXEC_PATH=%CD%\device SET U3_ENV_VERSION=1.0 SET U3_ENV_LANGUAGE=1033 -%U3_HOST_EXEC_PATH%\wireshark.exe %* +"%U3_HOST_EXEC_PATH%\wireshark.exe" %* |