aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2008-01-04 15:28:44 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2008-01-04 15:28:44 +0000
commit039ad15bbf0dd8010449c1ec5d7d84c18854213a (patch)
tree5a2f7429e70762d30ebef297ca71149a285a6325 /packaging
parent105c39452169a99274b933483e93fd3eaf6466d7 (diff)
UPX compression corrupts the WinPcap installer - so don't UPX it.
svn path=/trunk/; revision=24014
Diffstat (limited to 'packaging')
-rw-r--r--packaging/portableapps/win32/makefile.nmake2
-rw-r--r--packaging/u3/win32/makefile.nmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake
index bcf5fde3d9..220403138d 100644
--- a/packaging/portableapps/win32/makefile.nmake
+++ b/packaging/portableapps/win32/makefile.nmake
@@ -61,7 +61,7 @@ distribution: distribution.nmake
pack: distribution
!IFDEF UPX
- -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.exe
+ -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe
-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll
-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll
-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index c0ab764393..85ba5e14b6 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -88,7 +88,7 @@ pack: distribution
-$(UPX) $(UPX_FLAGS) $(HOST)\*.dll
-$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll
-$(UPX) $(UPX_FLAGS) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll
- -$(UPX) $(UPX_FLAGS) $(HOST)\*.exe
+ -$(UPX) $(UPX_FLAGS) $(HOST)\[a-z]*.exe
!ENDIF
test: pack