Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2

------------------------------------------------------------------------
r39726 | pierre | 2018-09-10 13:30:42 +0000 (Mon, 10 Sep 2018) | 1 line

 pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS
------------------------------------------------------------------------
--- Merging r39726 into '.':
U    rtl/msdos/Makefile
U    rtl/msdos/Makefile.fpc
--- Recording mergeinfo for merge of r39726 into '.':
 U   .
------------------------------------------------------------------------
r39732 | pierre | 2018-09-11 08:02:48 +0000 (Tue, 11 Sep 2018) | 1 line

 Add FPC_SOFT_FPUX80 and FPC_SOFT_FPU128 define handling
------------------------------------------------------------------------
--- Merging r39732 into '.':
U    rtl/linux/system.pp
--- Recording mergeinfo for merge of r39732 into '.':
 G   .
------------------------------------------------------------------------
r39734 | pierre | 2018-09-11 13:08:51 +0000 (Tue, 11 Sep 2018) | 1 line

 Increase default trace size to 16
------------------------------------------------------------------------
--- Merging r39734 into '.':
U    rtl/inc/heaptrc.pp
--- Recording mergeinfo for merge of r39734 into '.':
 G   .
------------------------------------------------------------------------
r39735 | pierre | 2018-09-11 13:10:59 +0000 (Tue, 11 Sep 2018) | 1 line

 Avoid wrap on 32-bit system for StackTop calculation
------------------------------------------------------------------------
--- Merging r39735 into '.':
U    rtl/inc/system.inc
--- Recording mergeinfo for merge of r39735 into '.':
 G   .
------------------------------------------------------------------------
r39736 | pierre | 2018-09-11 13:13:50 +0000 (Tue, 11 Sep 2018) | 5 lines

  * Add PAGESIZE local constant.
  + Set LAST_PAGE_GENERATES_SIGNAL macro for linux powerpc/powerpc64.
  + Use page_size for StackBottom computation.
  + Use LAST_PAGE_GENERATES_SIGNAL in StackBottom computation.

------------------------------------------------------------------------
--- Merging r39736 into '.':
G    rtl/linux/system.pp
--- Recording mergeinfo for merge of r39736 into '.':
 G   .
------------------------------------------------------------------------
r39801 | pierre | 2018-09-24 22:20:30 +0000 (Mon, 24 Sep 2018) | 1 line

 define iconv_is_in_libc by default for netbsd OS (can be disabled by adding -dDISABLE_ICONV_LIBC option
------------------------------------------------------------------------
--- Merging r39801 into '.':
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r39801 into '.':
 G   .
------------------------------------------------------------------------
r39806 | pierre | 2018-09-26 09:25:54 +0000 (Wed, 26 Sep 2018) | 1 line

 Rename Result parameter to _Result to avoid compilation error for ppcjvm
------------------------------------------------------------------------
--- Merging r39806 into '.':
U    packages/jni/src/jni.pas
--- Recording mergeinfo for merge of r39806 into '.':
 G   .
------------------------------------------------------------------------
r39807 | pierre | 2018-09-26 09:27:33 +0000 (Wed, 26 Sep 2018) | 1 line

 Explicitly also disable java OS target
------------------------------------------------------------------------
--- Merging r39807 into '.':
U    packages/sdl/fpmake.pp
--- Recording mergeinfo for merge of r39807 into '.':
 G   .
------------------------------------------------------------------------
r40002 | pierre | 2018-10-20 22:30:20 +0000 (Sat, 20 Oct 2018) | 1 line

 Add explicit typecast to avoid range ccheck error
------------------------------------------------------------------------
--- Merging r40002 into '.':
U    rtl/linux/termiosproc.inc
--- Recording mergeinfo for merge of r40002 into '.':
 G   .
------------------------------------------------------------------------
r40014 | pierre | 2018-10-22 21:14:59 +0000 (Mon, 22 Oct 2018) | 1 line

 Add missing unicode related units to netware OS
------------------------------------------------------------------------
--- Merging r40014 into '.':
U    rtl/netware/Makefile
U    rtl/netware/Makefile.fpc
--- Recording mergeinfo for merge of r40014 into '.':
 G   .
------------------------------------------------------------------------
r40358 | pierre | 2018-11-20 22:02:59 +0000 (Tue, 20 Nov 2018) | 1 line

 Add classes unit
------------------------------------------------------------------------
--- Merging r40358 into '.':
U    rtl/watcom/Makefile
U    rtl/watcom/Makefile.fpc
--- Recording mergeinfo for merge of r40358 into '.':
 G   .
------------------------------------------------------------------------
r40363 | pierre | 2018-11-23 13:29:01 +0000 (Fri, 23 Nov 2018) | 1 line

 Also disable fpdoc and pas2jni utils packages for targets not supporting fcl-process package
------------------------------------------------------------------------
--- Merging r40363 into '.':
U    utils/pas2jni/fpmake.pp
U    utils/fpdoc/fpmake.pp
--- Recording mergeinfo for merge of r40363 into '.':
 G   .
------------------------------------------------------------------------
r40392 | pierre | 2018-11-29 14:23:44 +0000 (Thu, 29 Nov 2018) | 1 line

 Fix delete of gdbver.inc generated file after gdbint unit compilation when called from packages level
------------------------------------------------------------------------
--- Merging r40392 into '.':
U    packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r40392 into '.':
 G   .
------------------------------------------------------------------------
r40397 | pierre | 2018-11-29 16:55:07 +0000 (Thu, 29 Nov 2018) | 1 line

 Fix cleaning of unicode utils package in fpmake
------------------------------------------------------------------------
--- Merging r40397 into '.':
U    utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r40397 into '.':
 G   .
------------------------------------------------------------------------
r40481 | pierre | 2018-12-06 17:06:45 +0000 (Thu, 06 Dec 2018) | 1 line

 Fix compilation of installer for win32 target
------------------------------------------------------------------------
--- Merging r40481 into '.':
U    installer/Makefile
U    installer/Makefile.fpc
U    packages/ide/Makefile.fpc
U    packages/ide/Makefile
--- Recording mergeinfo for merge of r40481 into '.':
 G   .
------------------------------------------------------------------------
r40537 | pierre | 2018-12-13 10:21:58 +0000 (Thu, 13 Dec 2018) | 1 line

Always accept empty string as meaning zero is TryRomanToInt, fixes intermittent errors in tromantoint test
------------------------------------------------------------------------
--- Merging r40537 into '.':
U    packages/rtl-objpas/src/inc/strutils.pp
U    tests/test/units/strutils/tromantoint.pp
--- Recording mergeinfo for merge of r40537 into '.':
 G   .


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@40618 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 416 insertions, 264 deletions

diff --git a/installer/Makefile b/installer/Makefile
index 48c21a58b4..c903c5c2b9 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -686,267 +686,6 @@ ifeq ($(FULL_TARGET),sparc64-linux)
 override CLEAN_FILES+=installer.pas
 endif
 override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i386-aros)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-macos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-openbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-netbsd)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),mipsel-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),mipsel-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),jvm-java)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),jvm-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i8086-msdos)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),aarch64-android)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override COMPILER_UNITDIR+=../ide
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override COMPILER_UNITDIR+=../ide
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1612,7 +1351,7 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl rtl-console fv unzip rtl-extra
+override REQUIRE_PACKAGES=rtl rtl-console fv unzip rtl-extra ide
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -1624,6 +1363,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 REQUIRE_PACKAGES_RTL=1
@@ -1636,6 +1378,10 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_GRAPH=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
@@ -1648,6 +1394,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
@@ -1660,6 +1409,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1672,6 +1424,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
@@ -1684,6 +1439,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 REQUIRE_PACKAGES_RTL=1
@@ -1696,6 +1454,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1708,6 +1469,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -1720,6 +1484,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
@@ -1732,6 +1499,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1744,6 +1514,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 REQUIRE_PACKAGES_RTL=1
@@ -1756,6 +1529,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -1768,6 +1544,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
@@ -1780,6 +1559,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
@@ -1792,6 +1574,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
@@ -1804,6 +1589,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -1816,6 +1604,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -1828,6 +1619,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -1840,6 +1634,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
@@ -1852,6 +1649,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
@@ -1864,6 +1664,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-android)
 REQUIRE_PACKAGES_RTL=1
@@ -1876,6 +1679,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i386-aros)
 REQUIRE_PACKAGES_RTL=1
@@ -1888,6 +1694,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -1900,6 +1709,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1912,6 +1724,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -1924,6 +1739,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
@@ -1936,6 +1754,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -1948,6 +1769,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-macos)
 REQUIRE_PACKAGES_RTL=1
@@ -1960,6 +1784,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -1972,6 +1799,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -1984,6 +1814,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1996,6 +1829,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
@@ -2008,6 +1844,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
@@ -2020,6 +1859,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2032,6 +1874,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
@@ -2044,6 +1889,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2056,6 +1904,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
@@ -2068,6 +1919,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
 REQUIRE_PACKAGES_RTL=1
@@ -2080,6 +1934,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2092,6 +1949,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2104,6 +1964,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2116,6 +1979,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2128,6 +1994,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2140,6 +2009,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2152,6 +2024,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2164,6 +2039,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
 REQUIRE_PACKAGES_RTL=1
@@ -2176,6 +2054,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2188,6 +2069,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2200,6 +2084,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
@@ -2212,6 +2099,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2224,6 +2114,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
 REQUIRE_PACKAGES_RTL=1
@@ -2236,6 +2129,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
 REQUIRE_PACKAGES_RTL=1
@@ -2248,6 +2144,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
 REQUIRE_PACKAGES_RTL=1
@@ -2260,6 +2159,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
 REQUIRE_PACKAGES_RTL=1
@@ -2272,6 +2174,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2284,6 +2189,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2296,6 +2204,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
@@ -2308,6 +2219,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2320,6 +2234,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -2332,6 +2249,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
@@ -2344,6 +2264,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
@@ -2356,6 +2279,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2368,6 +2294,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2380,6 +2309,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-android)
 REQUIRE_PACKAGES_RTL=1
@@ -2392,6 +2324,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
@@ -2404,6 +2339,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2416,6 +2354,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2428,6 +2369,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2440,6 +2384,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
 REQUIRE_PACKAGES_RTL=1
@@ -2452,6 +2399,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2464,6 +2414,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2476,6 +2429,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2488,6 +2444,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),mips-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2500,6 +2459,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2512,6 +2474,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2524,6 +2489,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
 REQUIRE_PACKAGES_RTL=1
@@ -2536,6 +2504,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),jvm-java)
 REQUIRE_PACKAGES_RTL=1
@@ -2548,6 +2519,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),jvm-android)
 REQUIRE_PACKAGES_RTL=1
@@ -2560,6 +2534,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2572,6 +2549,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
 REQUIRE_PACKAGES_RTL=1
@@ -2584,6 +2564,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
 REQUIRE_PACKAGES_RTL=1
@@ -2596,6 +2579,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2608,6 +2594,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2620,6 +2609,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
@@ -2632,6 +2624,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
@@ -2644,6 +2639,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2656,6 +2654,9 @@ REQUIRE_PACKAGES_RTL-CONSOLE=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_UNZIP=1
 REQUIRE_PACKAGES_RTL-EXTRA=1
+REQUIRE_PACKAGES_CHM=1
+REQUIRE_PACKAGES_REGEXPR=1
+REQUIRE_PACKAGES_IDE=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
@@ -3037,6 +3038,158 @@ ifdef UNITDIR_FPMAKE_RTL-EXTRA
 override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL-EXTRA)
 endif
 endif
+ifdef REQUIRE_PACKAGES_CHM
+PACKAGEDIR_CHM:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /chm/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_CHM),)
+ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX)),)
+UNITDIR_CHM=$(PACKAGEDIR_CHM)/units/$(TARGETSUFFIX)
+else
+UNITDIR_CHM=$(PACKAGEDIR_CHM)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_CHM=$(PACKAGEDIR_CHM)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_CHM)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_CHM) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_CHM)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_CHM=
+UNITDIR_CHM:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /chm/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_CHM),)
+UNITDIR_CHM:=$(firstword $(UNITDIR_CHM))
+else
+UNITDIR_CHM=
+endif
+endif
+ifdef UNITDIR_CHM
+override COMPILER_UNITDIR+=$(UNITDIR_CHM)
+endif
+ifdef UNITDIR_FPMAKE_CHM
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_CHM)
+endif
+endif
+ifdef REQUIRE_PACKAGES_REGEXPR
+PACKAGEDIR_REGEXPR:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_REGEXPR),)
+ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units/$(TARGETSUFFIX)),)
+UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(TARGETSUFFIX)
+else
+UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_REGEXPR=$(PACKAGEDIR_REGEXPR)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_REGEXPR)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_REGEXPR) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_REGEXPR)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_REGEXPR=
+UNITDIR_REGEXPR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_REGEXPR),)
+UNITDIR_REGEXPR:=$(firstword $(UNITDIR_REGEXPR))
+else
+UNITDIR_REGEXPR=
+endif
+endif
+ifdef UNITDIR_REGEXPR
+override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR)
+endif
+ifdef UNITDIR_FPMAKE_REGEXPR
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_REGEXPR)
+endif
+endif
+ifdef REQUIRE_PACKAGES_IDE
+PACKAGEDIR_IDE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ide/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_IDE),)
+ifneq ($(wildcard $(PACKAGEDIR_IDE)/units/$(TARGETSUFFIX)),)
+UNITDIR_IDE=$(PACKAGEDIR_IDE)/units/$(TARGETSUFFIX)
+else
+UNITDIR_IDE=$(PACKAGEDIR_IDE)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_IDE)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_IDE=$(PACKAGEDIR_IDE)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_IDE)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_IDE=$(PACKAGEDIR_IDE)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_IDE=$(PACKAGEDIR_IDE)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IDE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IDE) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IDE)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_IDE=
+UNITDIR_IDE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ide/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_IDE),)
+UNITDIR_IDE:=$(firstword $(UNITDIR_IDE))
+else
+UNITDIR_IDE=
+endif
+endif
+ifdef UNITDIR_IDE
+override COMPILER_UNITDIR+=$(UNITDIR_IDE)
+endif
+ifdef UNITDIR_FPMAKE_IDE
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IDE)
+endif
+endif
+ifdef REQUIRE_PACKAGES_GRAPH
+PACKAGEDIR_GRAPH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /graph/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_GRAPH),)
+ifneq ($(wildcard $(PACKAGEDIR_GRAPH)/units/$(TARGETSUFFIX)),)
+UNITDIR_GRAPH=$(PACKAGEDIR_GRAPH)/units/$(TARGETSUFFIX)
+else
+UNITDIR_GRAPH=$(PACKAGEDIR_GRAPH)
+endif
+ifneq ($(wildcard $(PACKAGEDIR_GRAPH)/units/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH)/units/$(SOURCESUFFIX)
+else
+ifneq ($(wildcard $(PACKAGEDIR_GRAPH)/units_bs/$(SOURCESUFFIX)),)
+UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH)/units_bs/$(SOURCESUFFIX)
+else
+UNITDIR_FPMAKE_GRAPH=$(PACKAGEDIR_GRAPH)
+endif
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_GRAPH)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_GRAPH) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_GRAPH)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_GRAPH=
+UNITDIR_GRAPH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /graph/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_GRAPH),)
+UNITDIR_GRAPH:=$(firstword $(UNITDIR_GRAPH))
+else
+UNITDIR_GRAPH=
+endif
+endif
+ifdef UNITDIR_GRAPH
+override COMPILER_UNITDIR+=$(UNITDIR_GRAPH)
+endif
+ifdef UNITDIR_FPMAKE_GRAPH
+override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_GRAPH)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
 endif
diff --git a/installer/Makefile.fpc b/installer/Makefile.fpc
index 7efc8cfbbe..6e5aeb4a9d 100644
--- a/installer/Makefile.fpc
+++ b/installer/Makefile.fpc
@@ -19,10 +19,9 @@ files_linux=installer.pas
 files_freebsd=installer.pas
 
 [require]
-packages=rtl-console fv unzip rtl-extra
+packages=rtl-console fv unzip rtl-extra ide
 
 [compiler]
-unitdir=../ide
 
 [install]
 fpcpackage=y