--- Merging r19272 into '.':

U    utils/fpcm/fpcmake.ini
C    utils/fpcm/fpcmake.inc
C    packages/fcl-web/Makefile
--- Merging r19917 into '.':
G    utils/fpcm/fpcmake.ini
C    utils/fpcm/Makefile
C    utils/fpcm/fpcmake.inc
Summary of conflicts:
  Text conflicts: 4

# revisions: 19272,19917
------------------------------------------------------------------------
r19272 | joost | 2011-09-28 21:51:50 +0200 (Wed, 28 Sep 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-web/Makefile
   M /trunk/utils/fpcm/fpcmake.inc
   M /trunk/utils/fpcm/fpcmake.ini

 * Pass binutilsprefix to compiler when building fpmake. For now only enabled for fcl-web.
------------------------------------------------------------------------
------------------------------------------------------------------------
r19917 | marco | 2011-12-29 22:50:00 +0100 (Thu, 29 Dec 2011) | 2 lines
Changed paths:
   M /trunk/utils/fpcm/Makefile
   M /trunk/utils/fpcm/fpcmake.inc
   M /trunk/utils/fpcm/fpcmake.ini

 * Remove upx support from makefiles.

------------------------------------------------------------------------

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

utils/fpcm/fpcmake.ini

@@ -1109,31 +1109,6 @@ else
 DATESTR=
 endif
 
-# Look if UPX is found for go32v2 and win32. We can't use $UPX because
-# upx uses that one itself (PFV)
-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:=
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
-
 # Zip options
 ZIPOPT=-9
 ZIPEXT=.zip
@@ -1171,11 +1146,13 @@ endif
 
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
+override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1655,10 +1632,6 @@ endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
         $(MKDIR) $(INSTALL_BINDIR)
-# Compress the exes if upx is defined
-ifdef UPXPROG
-        -$(UPXPROG) $(INSTALLEXEFILES)
-endif
         $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
 endif
 ifdef INSTALL_CREATEPACKAGEFPC
@@ -1981,7 +1954,6 @@ fpc_baseinfo:
         @$(ECHO)  Date...... $(DATE)
         @$(ECHO)  FPCMake... $(FPCMAKE)
         @$(ECHO)  PPUMove... $(PPUMOVE)
-        @$(ECHO)  Upx....... $(UPXPROG)
         @$(ECHO)  Zip....... $(ZIPPROG)
         @$(ECHO)
         @$(ECHO)  == Object info ==