diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-01-10 20:26:33 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-01-10 20:26:33 +0000 |
| commit | a5a126a88d84eeba2f32efe20d9a0e8247c3d377 (patch) | |
| tree | ab105e6bb8e402ed883f6a15f172f71ae15c884d /packaging/u3 | |
| parent | d2d3148e006a986dc8bab112ea2f385cbc8274df (diff) | |
| download | wireshark-a5a126a88d84eeba2f32efe20d9a0e8247c3d377.tar.gz | |
Fix the GNUTLS DLL names. Add the program version to the package file name.
svn path=/trunk/; revision=20380
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index e0f00bf22d..98458add67 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -229,9 +229,9 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe !endif !ifdef GNUTLS_DIR $(COPY) $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(HOST) $(COPY_FLAGS) - $(COPY) $(GNUTLS_DIR)\bin\libgnutls-14.dll $(HOST) $(COPY_FLAGS) - $(COPY) $(GNUTLS_DIR)\bin\libgnutls-extra-14.dll $(HOST) $(COPY_FLAGS) - $(COPY) $(GNUTLS_DIR)\bin\libgnutls-openssl-14.dll $(HOST) $(COPY_FLAGS) + $(COPY) $(GNUTLS_DIR)\bin\libgnutls-13.dll $(HOST) $(COPY_FLAGS) + $(COPY) $(GNUTLS_DIR)\bin\libgnutls-extra-13.dll $(HOST) $(COPY_FLAGS) + $(COPY) $(GNUTLS_DIR)\bin\libgnutls-openssl-13.dll $(HOST) $(COPY_FLAGS) $(COPY) $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(HOST) $(COPY_FLAGS) $(COPY) $(GNUTLS_DIR)\bin\libtasn1-3.dll $(HOST) $(COPY_FLAGS) !endif @@ -280,7 +280,7 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe $(COPY) u3util.exe $(HOST) $(COPY_FLAGS) package: distribution - zip -r wireshark.u3p $(MANIFEST) $(DEVICE) $(DATA) $(HOST) + zip -r wireshark-$(VERSION).u3p $(MANIFEST) $(DEVICE) $(DATA) $(HOST) u3util_LIBS= user32.lib shell32.lib @@ -295,7 +295,7 @@ clean: rm -rf $(DATA) rm -rf $(MANIFEST) rm -rf u3util.{exe,obj} - rm -rf wireshark.u3p + rm -rf wireshark-*.u3p rm -rf *~ distclean: clean |