changed unit output directories to fpc format units/CPU-OS

git-svn-id: trunk@7398 -

Makefile

@@ -855,103 +855,103 @@ ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_INCLUDEDIR+=debugger designer packager include include/$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)-$(OS_TARGET) lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) components/custom components/mpaslex ideintf/units/$(CPU_TARGET)/$(OS_TARGET) designer designer/units debugger packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_TARGETDIR+=.
@@ -1053,103 +1053,103 @@ ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITTARGETDIR+=.
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -3838,7 +3838,7 @@ endif
 .SUFFIXES: .rc .res
 %.res: %.rc
 	windres -i $< -o $@ --preprocessor $(RCPP)
-ide:
+ide: $(COMPILER_UNITTARGETDIR)
 ifeq ($(OS_TARGET), win32)
 	$(MAKE) lazarus.res
 endif
@@ -3847,9 +3847,9 @@ ifeq ($(LAZARUS_OPT),)
 else
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
 endif
-idepkg:
+idepkg: $(COMPILER_UNITTARGETDIR)
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
-starter:
+starter: $(COMPILER_UNITTARGETDIR)
 ifeq ($(OS_TARGET), win32)
 	$(MAKE) startlazarus.res
 endif
@@ -3865,6 +3865,9 @@ cleanide:
 	-$(DEL) $(wildcard *$(OEXT))
 	-$(DEL) $(wildcard *$(PPUEXT))
 	-$(DEL) $(wildcard *$(RSTEXT))
+	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT))
+	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT))
+	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
 	-$(DEL) $(wildcard ./designer/*$(OEXT))
 	-$(DEL) $(wildcard ./designer/*$(PPUEXT))
 	-$(DEL) $(wildcard ./debugger/*$(OEXT))

Makefile.fpc

@@ -17,14 +17,17 @@ exampledirs=examples
 
 [compiler]
 options=-gl
-unittargetdir=.
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
-unitdir=lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
+unitdir=lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-        lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) \
+        lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-        components/units/$(CPU_TARGET)/$(OS_TARGET) \
+        components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
-        components/custom components/mpaslex \
+        components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \
+        components/custom \
+        components/mpaslex \
         ideintf/units/$(CPU_TARGET)/$(OS_TARGET) \
         designer designer/units debugger \
-        packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+        packager \
+        packager/units/$(CPU_TARGET)/$(OS_TARGET) .
 includedir=debugger designer packager include include/$(OS_TARGET)
 targetdir=.
 
@@ -92,7 +95,7 @@ endif
         windres -i $< -o $@ --preprocessor $(RCPP)
 
 #-----------------------------------------------------------------------------
-ide:
+ide: $(COMPILER_UNITTARGETDIR)
 ifeq ($(OS_TARGET), win32)
         $(MAKE) lazarus.res
 endif
@@ -103,11 +106,11 @@ else
 endif
 
 #-----------------------------------------------------------------------------
-idepkg:
+idepkg: $(COMPILER_UNITTARGETDIR)
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
 
 #-----------------------------------------------------------------------------
-starter:
+starter: $(COMPILER_UNITTARGETDIR)
 ifeq ($(OS_TARGET), win32)
         $(MAKE) startlazarus.res
 endif
@@ -129,6 +132,9 @@ cleanide:
         -$(DEL) $(wildcard *$(OEXT))
         -$(DEL) $(wildcard *$(PPUEXT))
         -$(DEL) $(wildcard *$(RSTEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT))
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT))
         -$(DEL) $(wildcard ./designer/*$(OEXT))
         -$(DEL) $(wildcard ./designer/*$(PPUEXT))
         -$(DEL) $(wildcard ./debugger/*$(OEXT))

components/codetools/Makefile.fpc

@@ -11,7 +11,7 @@ version=1.0
 packages=fcl
 
 [compiler]
-unittargetdir=../units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
 unitdir=.
 options=-gl
 
@@ -27,7 +27,10 @@ implicitunits=codetoolsstrconsts avl_tree basiccodetools codecache sourcelog \
    laz_dom laz_xmlcfg laz_xmlread laz_xmlwrite
 
 [clean]
-files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 
 [rules]
 .PHONY: cleartarget all
@@ -35,7 +38,7 @@ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/allcodetoolunits$(PPUEXT)
 
-all: cleartarget allcodetoolunits$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) allcodetoolunits$(PPUEXT)
 
 # end.
 

components/codetools/definetemplates.pas

@@ -3528,7 +3528,7 @@ const
     
 var
   MainDir, DirTempl, SubDirTempl, IntfDirTemplate, IfTemplate,
-  LCLUnitsDir, LCLUnitsCPUDir, LCLUnitsCPUOSDir, LCLUnitsCPUOSWidgetSetDir,
+  LCLUnitsDir, LCLUnitsCPUOSDir, LCLUnitsCPUOSWidgetSetDir,
   SubTempl: TDefineTemplate;
   TargetOS, SrcOS, SrcPath, TargetCPU: string;
   i: Integer;
@@ -3537,6 +3537,11 @@ var
   LCLWidgetSetDir: TDefineTemplate;
   IDEIntfDir: TDefineTemplate;
   ToolsInstallDirTempl: TDefineTemplate;
+  CurCPUOS: String;
+  SynEditDirTempl: TDefineTemplate;
+  SynEditUnitsDirTempl: TDefineTemplate;
+  CodeToolsDirTempl: TDefineTemplate;
+  CodeToolsUnitsDirTempl: TDefineTemplate;
 begin
   Result:=nil;
   if (LazarusSrcDir='') or (WidgetType='') then exit;
@@ -3752,12 +3757,6 @@ begin
   DirTempl:=TDefineTemplate.Create('Examples',
     Format(ctsNamedDirectory,['Examples']),
     '','examples',da_Directory);
-  DirTempl.AddChild(TDefineTemplate.Create('Unit path addition',
-    Format(ctsAddsDirToSourcePath,['components']),
-    ExternalMacroStart+'SrcPath',
-    d('..;../components/units/'+TargetCPU+'/'+TargetOS
-    +';'+SrcPath)
-    ,da_Define));
   DirTempl.AddChild(TDefineTemplate.Create('LCL path addition',
     Format(ctsAddsDirToSourcePath,['lcl']),
     ExternalMacroStart+'SrcPath',
@@ -3795,31 +3794,24 @@ begin
   begin
     SplitLazarusCPUOSWidgetCombo(Lazarus_CPU_OS_Widget_Combinations[i],
                                  CurCPU,CurOS,CurWidgetSet);
-    // <LazarusSrcDir>/lcl/units/<TargetCPU>
+    // <LazarusSrcDir>/lcl/units/<TargetCPU>-<TargetOS>
-    LCLUnitsCPUDir:=LCLUnitsDir.FindChildByName(CurCPU);
-    if LCLUnitsCPUDir=nil then begin
-      LCLUnitsCPUDir:=TDefineTemplate.Create(CurCPU,
-        Format(ctsNamedDirectory,[CurCPU]),
-        '',CurCPU,da_Directory);
-      LCLUnitsDir.AddChild(LCLUnitsCPUDir);
-    end;
-    // <LazarusSrcDir>/lcl/units/<TargetCPU>/<TargetOS>
     // these directories contain the output of the LCL (excluding the interfaces)
-    LCLUnitsCPUOSDir:=LCLUnitsCPUDir.FindChildByName(CurOS);
+    CurCPUOS:=CurCPU+'-'+CurOS;
+    LCLUnitsCPUOSDir:=LCLUnitsDir.FindChildByName(CurCPUOS);
     if LCLUnitsCPUOSDir=nil then begin
-      LCLUnitsCPUOSDir:=TDefineTemplate.Create(CurOS,
+      LCLUnitsCPUOSDir:=TDefineTemplate.Create(CurCPUOS,
-        Format(ctsNamedDirectory,[CurOS]),
+        Format(ctsNamedDirectory,[CurCPUOS]),
-        '',CurOS,da_Directory);
+        '',CurCPUOS,da_Directory);
-      LCLUnitsCPUDir.AddChild(LCLUnitsCPUOSDir);
+      LCLUnitsDir.AddChild(LCLUnitsCPUOSDir);
-      
+
-      ExtraSrcPath:='../../..;../../../widgetset';
+      ExtraSrcPath:='../..;../../widgetset';
       if CurOS<>'win32' then
         ExtraSrcPath:=ExtraSrcPath+';../../../nonwin32';
       LCLUnitsCPUOSDir.AddChild(TDefineTemplate.Create('CompiledSrcPath',
          ctsSrcPathForCompiledUnits,CompiledSrcPathMacroName,
          d(ExtraSrcPath),da_Define));
     end;
-    // <LazarusSrcDir>/lcl/units/<TargetCPU>/<TargetOS>/<WidgetSet>
+    // <LazarusSrcDir>/lcl/units/<TargetCPU>-<TargetOS>/<WidgetSet>
     // these directories contain the output of the LCL interfaces
     LCLUnitsCPUOSWidgetSetDir:=LCLUnitsCPUOSDir.FindChildByName(CurWidgetSet);
     if LCLUnitsCPUOSWidgetSetDir=nil then begin
@@ -3827,9 +3819,9 @@ begin
         Format(ctsNamedDirectory,[CurWidgetSet]),
         '',CurWidgetSet,da_Directory);
       LCLUnitsCPUOSDir.AddChild(LCLUnitsCPUOSWidgetSetDir);
-      ExtraSrcPath:='../../../../interfaces/'+CurWidgetSet;
+      ExtraSrcPath:='../../../interfaces/'+CurWidgetSet;
       if (CurWidgetSet='gnome') or (CurWidgetSet='gtk2') then
-        ExtraSrcPath:=ExtraSrcPath+';../../../../interfaces/gtk';
+        ExtraSrcPath:=ExtraSrcPath+';../../../interfaces/gtk';
       LCLUnitsCPUOSWidgetSetDir.AddChild(
         TDefineTemplate.Create('CompiledSrcPath',
           ctsSrcPathForCompiledUnits,CompiledSrcPathMacroName,
@@ -3914,17 +3906,31 @@ begin
     ,da_DefineRecurse));
   MainDir.AddChild(DirTempl);
   
-  // <LazarusSrcDir>/components/units
+  // <LazarusSrcDir>/components/synedit/units
-  SubDirTempl:=TDefineTemplate.Create('units',
+  SynEditDirTempl:=TDefineTemplate.Create('synedit',
-    'compiled components for the IDE',
+    'SynEdit','','synedit',da_Directory);
-    '','units',da_Directory);
+  SynEditUnitsDirTempl:=TDefineTemplate.Create('synedit output directory',
-  SubDirTempl.AddChild(TDefineTemplate.Create('CompiledSrcPath',
+    'units','','units',da_Directory);
+  SynEditDirTempl.AddChild(SynEditUnitsDirTempl);
+  SynEditUnitsDirTempl.AddChild(TDefineTemplate.Create('CompiledSrcPath',
      ctsSrcPathForCompiledUnits,
      ExternalMacroStart+'CompiledSrcPath',
-     d(LazarusSrcDir+'components/synedit;'
+     d(LazarusSrcDir+'components/synedit')
-      +LazarusSrcDir+'components/codetools')
      ,da_DefineRecurse));
-  DirTempl.AddChild(SubDirTempl);
+  DirTempl.AddChild(SynEditDirTempl);
+
+  // <LazarusSrcDir>/components/codetools/units
+  CodeToolsDirTempl:=TDefineTemplate.Create('codetools',
+    'CodeTools','','codetools',da_Directory);
+  CodeToolsUnitsDirTempl:=TDefineTemplate.Create('codetools output directory',
+    'units','','units',da_Directory);
+  CodeToolsDirTempl.AddChild(CodeToolsUnitsDirTempl);
+  CodeToolsUnitsDirTempl.AddChild(TDefineTemplate.Create('CompiledSrcPath',
+     ctsSrcPathForCompiledUnits,
+     ExternalMacroStart+'CompiledSrcPath',
+     d(LazarusSrcDir+'components/codetools')
+     ,da_DefineRecurse));
+  DirTempl.AddChild(CodeToolsDirTempl);
 
   // <LazarusSrcDir>/components/custom
   SubDirTempl:=TDefineTemplate.Create('Custom Components',

components/synedit/Makefile.fpc

@@ -8,8 +8,8 @@ name=synedit
 version=1.0.3
 
 [compiler]
-unittargetdir=../units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
-unitdir=../../lcl/units/$(CPU_TARGET)/$(OS_TARGET) .
+unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
 options=-gl
 
 [target]
@@ -31,7 +31,10 @@ packages=fcl regexpr
 #lcldir=../../lcl
 
 [clean]
-files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 
 [rules]
 .PHONY: cleartarget all
@@ -39,4 +42,4 @@ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/allsyneditunits$(PPUEXT)
 
-all: cleartarget allsyneditunits$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) allsyneditunits$(PPUEXT)

components/units/i386/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/i386/freebsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/i386/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/i386/netbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/i386/openbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/i386/win32/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/powerpc/darwin/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/powerpc/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/sparc/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

components/units/x86_64/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

designer/jitform/Makefile.fpc

@@ -8,7 +8,7 @@ name=jitform
 version=0.9b
 
 [compiler]
-unitdir=../../lcl/units/$(CPU_TARGET)/$(OS_TARGET) .
+unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
 unittargetdir=../units
 options=-gl
 
@@ -30,7 +30,7 @@ lcldir=../../lcl
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/jitform$(PPUEXT)
 
-all: cleartarget jitform$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) jitform$(PPUEXT)
 
 # end.
 

examples/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/09]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) sunos qnx
+UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
@@ -260,7 +260,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -326,7 +326,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -359,7 +359,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -425,7 +425,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -458,7 +458,7 @@ endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override COMPILER_OPTIONS+=-gl
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 override COMPILER_OPTIONS+=-gl
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -524,7 +524,7 @@ endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override COMPILER_OPTIONS+=-gl
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OPTIONS+=-gl
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -537,103 +537,103 @@ ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_OPTIONS+=-gl
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) ../components/units/$(CPU_TARGET)/$(OS_TARGET) .. .
+override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -945,7 +945,7 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=sun
@@ -1071,7 +1071,7 @@ STATICLIBEXT=.a
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),sunos)
+ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 PPUEXT=.ppu
 ASMEXT=.s
@@ -1383,7 +1383,7 @@ export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
-TAROPT=vI
+TAROPT=vj
 TAREXT=.tar.bz2
 else
 TAROPT=vz
@@ -1429,10 +1429,10 @@ endif
 ifeq ($(FULL_TARGET),i386-os2)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
@@ -1471,7 +1471,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),i386-sunos)
+ifeq ($(FULL_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -1523,10 +1523,10 @@ endif
 ifeq ($(FULL_TARGET),i386-emx)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_REGEXPR=1
 REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
@@ -1714,7 +1714,7 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),sparc-sunos)
+ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
@@ -2275,12 +2275,16 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
+ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
 ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+ifneq ($(TARGETDIRPREFIX),)
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
+endif
 endif
 fpc_install: all $(INSTALLTARGET)
 ifdef INSTALLEXEFILES
@@ -2294,7 +2298,7 @@ ifdef INSTALL_CREATEPACKAGEFPC
 ifdef FPCMAKE
 ifdef PACKAGE_VERSION
 ifneq ($(wildcard Makefile.fpc),)
-	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
 endif

examples/Makefile.fpc

@@ -63,10 +63,11 @@ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) \
             
 [compiler]
 options=-gl  
-unitdir=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
+unitdir=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-        ../lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) \
+        ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-        ../components/units/$(CPU_TARGET)/$(OS_TARGET) \
+        ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \
-        .. .
+        ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
+        .
 units=allexamples
 
 

ideintf/Makefile.fpc

@@ -8,10 +8,10 @@ name=ideintf
 version=0.9b
 
 [compiler]
-unitdir=../lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
+unitdir=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-        ../components/units/$(CPU_TARGET)/$(OS_TARGET) \
+        ../components/codetools/$(CPU_TARGET)-$(OS_TARGET) \
-        ../packager/units/$(CPU_TARGET)/$(OS_TARGET) .
+        ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-unittargetdir=units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
 options=-gl
 
 [target]
@@ -58,7 +58,7 @@ lcldir=../lcl
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/allideintf$(PPUEXT)
 
-all: cleartarget allideintf$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) allideintf$(PPUEXT)
 
 # end.
 

ideintf/units/i386/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/i386/freebsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/i386/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/i386/netbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/i386/openbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/i386/win32/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/powerpc/darwin/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/powerpc/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/sparc/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

ideintf/units/x86_64/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/Makefile

@@ -1071,103 +1071,103 @@ ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_UNITDIR+=. $(NONWIN32) widgetset
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -3406,7 +3406,7 @@ endif
 .PHONY: cleartarget all
 cleartarget:
 	-$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)
-all: cleartarget alllclunits$(PPUEXT) $(TARGET_DIRS)
+all: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) $(TARGET_DIRS)
 cleanlaz: clean
 	$(MAKE) -C interfaces clean
 	$(MAKE) -C interfaces/carbon clean

lcl/Makefile.fpc

@@ -85,7 +85,7 @@ endif
 
 [compiler]
 options=-gl
-unittargetdir=units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)
 unitdir=. $(NONWIN32) widgetset
 includedir=include
 
@@ -111,7 +111,7 @@ lcldir=.
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/alllclunits$(PPUEXT)
 
-all: cleartarget alllclunits$(PPUEXT) $(TARGET_DIRS)
+all: cleartarget $(COMPILER_UNITTARGETDIR) alllclunits$(PPUEXT) $(TARGET_DIRS)
 
 cleanlaz: clean
         $(MAKE) -C interfaces clean

lcl/interfaces/carbon/Makefile.fpc

@@ -15,8 +15,8 @@ implicitunits=carbonint
 
 [compiler]
 options=-gl -dcarbon1
-unitdir=../../units/$(CPU_TARGET)/$(OS_TARGET) .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
-unittargetdir=../../units/$(CPU_TARGET)/$(OS_TARGET)/carbon
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
 
 [clean]
 files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
@@ -32,4 +32,4 @@ cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
                 $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
 
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)

lcl/interfaces/gnome/Makefile.fpc

@@ -15,8 +15,8 @@ implicitunits=gnomeint
 
 [compiler]
 options=-gl -dgtk1 -dgnome1
-unitdir=../../units/$(CPU_TARGET)/$(OS_TARGET) ../gtk .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) ../gtk .
-unittargetdir=../../units/$(CPU_TARGET)/$(OS_TARGET)/gnome
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/gnome
 
 [clean]
 files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
@@ -32,4 +32,4 @@ cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
                 $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
 
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)

lcl/interfaces/gtk/Makefile.fpc

@@ -15,8 +15,8 @@ implicitunits=gtkdef gtkglobals gtkint gtkmsgqueue gtkproc gtkwinapiwindow
 
 [compiler]
 options=-gl -dgtk1
-unitdir=../../units/$(CPU_TARGET)/$(OS_TARGET) .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
-unittargetdir=../../units/$(CPU_TARGET)/$(OS_TARGET)/gtk
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
 
 [clean]
 files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
@@ -31,5 +31,5 @@ files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
                 $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
-
+                
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)

lcl/interfaces/gtk2/Makefile.fpc

@@ -15,8 +15,8 @@ implicitunits=gtk2int
 
 [compiler]
 options=-gl -dgtk2
-unitdir=../../units/$(CPU_TARGET)/$(OS_TARGET) ../gtk .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) ../gtk .
-unittargetdir=../../units/$(CPU_TARGET)/$(OS_TARGET)/gtk2
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
 
 [clean]
 files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
@@ -32,4 +32,4 @@ cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
                 $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
 
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)

lcl/interfaces/qt/Makefile.fpc

@@ -2,8 +2,7 @@
 #
 #   Makefile.fpc for Lazarus for Free Pascal
 #   
-# test
+
-     
 [package]
 main=lcl
 
@@ -15,23 +14,21 @@ units=interfaces
 
 [compiler]
 options=-gl -dqt
-unitdir=../../units .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
-unittargetdir=../../units/qt
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
 
 [clean]
-files=$(wildcard ../../units/qt/*$(OEXT)) \
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
-      $(wildcard ../../units/qt/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
-      $(wildcard ../../units/qt/*$(RSTEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
       $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 
-[prerules]
-DIST_DESTDIR=$(BASEDIR)/../../../dist
-
 [rules]
 .PHONY: cleartarget all
 
 cleartarget:
-        -$(DEL) ../../units/qt/interfaces$(PPUEXT) ../../units/interfaces$(PPUEXT)
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
+                $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
 
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)
 

lcl/interfaces/win32/Makefile.fpc

@@ -15,8 +15,8 @@ implicitunits=winext win32def win32proc win32int
 
 [compiler]
 options=-gl
-unitdir=../../units/$(CPU_TARGET)/$(OS_TARGET) .
+unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
-unittargetdir=../../units/$(CPU_TARGET)/$(OS_TARGET)/win32
+unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
 
 [clean]
 files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
@@ -30,5 +30,5 @@ cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/interfaces$(PPUEXT) \
                 $(COMPILER_UNITTARGETDIR)/interfaces$(OEXT)
 
-all: cleartarget interfaces$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) interfaces$(PPUEXT)
 

lcl/units/i386/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/freebsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/freebsd/gnome/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/freebsd/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/freebsd/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/linux/gnome/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/linux/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/linux/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/linux/qt/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/netbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/netbsd/gnome/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/netbsd/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/netbsd/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/openbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/openbsd/gnome/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/openbsd/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/openbsd/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/win32/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/win32/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/i386/win32/win32/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/powerpc/darwin/carbon/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/powerpc/darwin/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/powerpc/linux/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/powerpc/linux/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/sparc/linux/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

lcl/units/x86_64/linux/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/packagesystem.pas

@@ -874,7 +874,7 @@ begin
     
     // add lazarus registration unit path
     UsageOptions.UnitPath:=SetDirSeparators(
-      '$(LazarusDir)/packager/units/$(TargetCPU)/$(TargetOS)');
+      '$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)');
 
     // add registering units
     AddFile(SetDirSeparators('db/db.pp'),'DB',pftUnit,
@@ -885,7 +885,7 @@ begin
     // use the packager/units/lazaruspackageintf.o file as indicator,
     // if FCL has been recompiled
     OutputStateFile:=SetDirSeparators(
-      '$(LazarusDir)/packager/units/$(TargetCPU)/$(TargetOS)/lazaruspackageintf.o');
+      '$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)/lazaruspackageintf.o');
 
     Modified:=false;
   end;
@@ -921,7 +921,7 @@ begin
     Description:=lisPkgSysTheLCLLazarusComponentLibraryContainsAllBase;
     PackageType:=lptDesignTime;
     Installed:=pitStatic;
-    CompilerOptions.UnitOutputDirectory:='';
+    CompilerOptions.UnitOutputDirectory:='$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/';
 
     // add requirements
     AddRequiredDependency(FCLPackage.CreateDependencyForThisPkg(Result));
@@ -962,8 +962,8 @@ begin
 
     // add unit paths
     UsageOptions.UnitPath:=SetDirSeparators(
-       '$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS);'
+       '$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS);'
-      +'$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)/$(LCLWidgetType)');
+      +'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)');
     UsageOptions.CustomOptions:='-dLCL';
     // add include path
     CompilerOptions.IncludeFiles:=SetDirSeparators(
@@ -973,7 +973,7 @@ begin
     // use the lcl/units/$(TargetCPU)/$(TargetOS)/alllclunits.o
     // file as indicator, if LCL has been recompiled
     OutputStateFile:=SetDirSeparators(
-      '$(LazarusDir)/lcl/units/$(TargetCPU)/$(TargetOS)/alllclunits.o');
+      '$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/alllclunits.o');
 
     Modified:=false;
   end;
@@ -1024,12 +1024,12 @@ begin
 
     // add unit paths
     UsageOptions.UnitPath:=SetDirSeparators(
-                     '$(LazarusDir)/components/units/$(TargetCPU)/$(TargetOS)');
+                     '$(LazarusDir)/components/synedit/units/$(TargetCPU)-$(TargetOS)');
 
     // use the components/units/..../allsyneditunits.o file as indicator,
     // if synedit has been recompiled
     OutputStateFile:=SetDirSeparators(
-      '$(LazarusDir)/components/units/$(TargetCPU)/$(TargetOS)/allsyneditunits.o');
+      '$(LazarusDir)/components/synedit/units/$(TargetCPU)-$(TargetOS)/allsyneditunits.o');
 
     Modified:=false;
   end;
@@ -1077,12 +1077,12 @@ begin
 
     // add unit paths
     UsageOptions.UnitPath:=SetDirSeparators(
-      '$(LazarusDir)/ideintf/units/$(TargetCPU)/$(TargetOS)');
+      '$(LazarusDir)/ideintf/units/$(TargetCPU)-$(TargetOS)');
 
     // use the ideintf/units/$(TargetCPU)/$(TargetOS)/allideintf.o file
     // as indicator, if ideintf has been recompiled
     OutputStateFile:=SetDirSeparators(
-      '$(LazarusDir)/ideintf/units/$(TargetCPU)/$(TargetOS)/allideintf.o');
+      '$(LazarusDir)/ideintf/units/$(TargetCPU)-$(TargetOS)/allideintf.o');
 
     Modified:=false;
   end;

packager/registration/Makefile

@@ -628,103 +628,103 @@ ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_UNITDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)/$(OS_TARGET)
+override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -2650,4 +2650,4 @@ cleanlaz: clean
 .PHONY: cleartarget all
 cleartarget:
 	-$(DEL) $(COMPILER_UNITTARGETDIR)/lazaruspackageintf$(PPUEXT)
-all: cleartarget lazaruspackageintf$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) lazaruspackageintf$(PPUEXT)

packager/registration/Makefile.fpc

@@ -9,7 +9,7 @@ version=0.9b
 
 [compiler]
 unitdir=.
-unittargetdir=../units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=../units/$(CPU_TARGET)-$(OS_TARGET)
 options=-gl
 
 [target]
@@ -33,7 +33,7 @@ cleanlaz: clean
 cleartarget:
         -$(DEL) $(COMPILER_UNITTARGETDIR)/lazaruspackageintf$(PPUEXT)
 
-all: cleartarget lazaruspackageintf$(PPUEXT)
+all: cleartarget $(COMPILER_UNITTARGETDIR) lazaruspackageintf$(PPUEXT)
 
 # end.
 

packager/units/i386/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/i386/freebsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/i386/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/i386/netbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/i386/openbsd/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/i386/win32/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/powerpc/darwin/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/powerpc/linux/gtk/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/powerpc/linux/gtk2/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/sparc/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

packager/units/x86_64/linux/README

@@ -1,3 +0,0 @@
-This is an output directory, so it is empty at start or after clean up.
-But CVS does not always create empty directories.
-This file makes sure the directory is created.

tools/Makefile.fpc

@@ -16,9 +16,9 @@ packages=rtl fcl
 
 [compiler]
 options=-gl
-unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
+unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-          $(LAZDIR)/lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) \
+          $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-          $(LAZDIR)/components/units/$(CPU_TARGET)/$(OS_TARGET) \
+unittargetdir=.
 targetdir=.
 
 [prerules]

tools/apiwizz/Makefile.fpc

@@ -17,9 +17,9 @@ packages=rtl fcl
 
 [compiler]
 options=-gl
-unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
+unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
-          $(LAZDIR)/lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) \
+          $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-          $(LAZDIR)/components/units/$(CPU_TARGET)/$(OS_TARGET)
+unittargetdir=.
 targetdir=.
 
 [prerules]