--- Merging r16240 into '.':

U    utils/Makefile.fpc
C    utils/Makefile
--- Merging r16240 into 'tests/utils':
 G   tests/utils
--- Merging r16240 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1

git-svn-id: tags/release_2_4_2@16241 -

utils/Makefile

@@ -285,7 +285,7 @@ ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc
+override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc fpcmkcfg  fpcres
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=fppkg fpcm tply h2pas fprcp dxegen fpdoc  fpcres
@@ -2898,6 +2898,7 @@ TARGET_DIRS_H2PAS=1
 TARGET_DIRS_FPRCP=1
 TARGET_DIRS_DXEGEN=1
 TARGET_DIRS_FPDOC=1
+TARGET_DIRS_FPCRES=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_FPPKG=1

utils/Makefile.fpc

@@ -13,6 +13,7 @@ programs_linux=grab_vcsa
 dirs_win32=fpmc fpcres
 dirs_win64=fpmc fpcres
 dirs_wince=fpcres
+dirs_haiku=fpcres
 dirs_linux=fpcres
 dirs_freebsd=fpcres
 dirs_openbsd=fpcres