diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-04-10 21:30:40 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-04-10 21:30:40 +0000 |
| commit | 161c7f8b8c9a2524a606c5e9dd1b854819285d55 (patch) | |
| tree | 44112ac9ef0ce8a9d482750cb71bd4f3726f89d6 /Makefile.nmake | |
| parent | 8d756c3049e7b76f86221f7dafb871fb1f16369a (diff) | |
| download | wireshark-161c7f8b8c9a2524a606c5e9dd1b854819285d55.tar.gz wireshark-161c7f8b8c9a2524a606c5e9dd1b854819285d55.tar.bz2 wireshark-161c7f8b8c9a2524a606c5e9dd1b854819285d55.zip | |
If MSVCR_DLL or VCREDIST_EXE are defined, add them to the zip packages.
Zip the entire directory instead of just the top-level contents.
svn path=/trunk/; revision=21378
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d45c3fd79f..3979e26ffa 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -150,13 +150,27 @@ packaging_u3: all # use (info-)zip from cygwin to pack things packaging_zip1: all +!IFDEF MSVCR_DLL + xcopy $(MSVCR_DLL) $(INSTALL1_DIR) +!ENDIF +!IFDEF VCREDIST_EXE + @echo Including vcredist_x86.exe -- your recipient may need to run it! + xcopy $(MSVCR_DLL) $(INSTALL1_DIR) +!ENDIF rm -f wireshark-gtk1.zip - zip -r -9 wireshark-gtk1.zip $(INSTALL1_DIR)/*.* + zip -r -9 wireshark-gtk1.zip $(INSTALL1_DIR)/ # use (info-)zip from cygwin to pack things packaging_zip2: all +!IFDEF MSVCR_DLL + xcopy $(MSVCR_DLL) $(INSTALL2_DIR) +!ENDIF +!IFDEF VCREDIST_EXE + @echo Including vcredist_x86.exe -- your recipient may need to run it! + xcopy $(VCREDIST_EXE) $(INSTALL2_DIR) +!ENDIF rm -f wireshark-gtk2.zip - zip -r -9 wireshark-gtk2.zip $(INSTALL2_DIR)/*.* + zip -r -9 wireshark-gtk2.zip $(INSTALL2_DIR)/ packaging_zip: packaging_zip1 packaging_zip2 |