--- Merging r19745 into '.':

U    utils/fpcm/fpcmake.ini
C    utils/fpcm/fpcmake.inc
Summary of conflicts:
  Text conflicts: 1

# revisions: 19745
------------------------------------------------------------------------
r19745 | florian | 2011-12-04 16:29:14 +0100 (Sun, 04 Dec 2011) | 1 line
Changed paths:
   M /trunk/utils/fpcm/fpcmake.inc
   M /trunk/utils/fpcm/fpcmake.ini

* disable upx for win32, resolves #20772
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19808 -

utils/fpcm/fpcmake.ini

@@ -1019,8 +1019,6 @@ SHAREDLIBEXT=.so
 SHORTSUFFIX=wii
 endif
 
-endif
-
 # For 8.3 limited OS's the short suffixes
 # Otherwise use the full source/target names
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
@@ -1117,8 +1115,11 @@ ifndef UPXPROG
 ifeq ($(OS_TARGET),go32v2)
 UPXPROG:=1
 endif
+# today's harddisks are large enough so using upx
+# makes no sense especially because it causes
+# some trouble, see e.g. #20772
 ifeq ($(OS_TARGET),win32)
-UPXPROG:=1
+UPXPROG:=
 endif
 ifdef UPXPROG
 UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))