diff --git a/base/Makefile b/base/Makefile
index 5b829d296f..f9dcc12bb9 100644
--- a/base/Makefile
+++ b/base/Makefile
@@ -47,7 +47,7 @@ FPINSTDIR=fpinst
 endif
 
 ifndef IDEDIR
-IDEDIR=ide/text
+IDEDIR=ide
 endif
 
 #####################################################################
@@ -383,7 +383,10 @@ compilerzip: compiler_clean rtl_clean
 
 #
 # $Log$
-# Revision 1.11  1999-04-08 10:16:16  peter
+# Revision 1.12  1999-04-16 20:15:41  michael
+# + Adapted ide Makefiles
+#
+# Revision 1.11  1999/04/08 10:16:16  peter
 #   * zipinstall for linux with .tar.gz
 #
 # Revision 1.10  1999/04/01 22:16:02  peter
diff --git a/ide/Makefile b/ide/Makefile
new file mode 100644
index 0000000000..de7d5489e2
--- /dev/null
+++ b/ide/Makefile
@@ -0,0 +1,126 @@
+#
+#   $Id$
+#   Copyright (c) 1998 by the Free Pascal Development Team
+#
+#   Makefile for Free Pascal Environment
+#
+#   See the file COPYING.FPC, included in this distribution,
+#   for details about the copyright.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+#####################################################################
+# Defaults
+#####################################################################
+
+# Default place of the makefile.fpc
+DEFAULTFPCDIR=..
+
+#####################################################################
+# Common targets
+#####################################################################
+
+.PHONY: all clean install info \
+        staticlib sharedlib libsclean \
+        staticinstall sharedinstall libinstall \
+        
+info: testfpcmake fpc_info
+
+#####################################################################
+# Include default makefile
+#####################################################################
+
+# test if FPCMAKE is still valid
+ifdef FPCMAKE
+ifeq ($(strip $(wildcard $(FPCMAKE))),)
+FPCDIR=
+FPCMAKE=
+endif
+endif
+
+ifndef FPCDIR
+ifdef DEFAULTFPCDIR
+FPCDIR=$(DEFAULTFPCDIR)
+endif
+endif
+
+ifndef FPCMAKE
+ifdef FPCDIR
+FPCMAKE=$(FPCDIR)/makefile.fpc
+else
+FPCMAKE=makefile.fpc
+endif
+endif
+
+override FPCMAKE:=$(strip $(wildcard $(FPCMAKE)))
+ifeq ($(FPCMAKE),)
+testfpcmake:
+	@echo makefile.fpc not found!
+	@echo Check the FPCMAKE and FPCDIR environment variables.
+	@exit
+else
+include $(FPCMAKE)
+testfpcmake:
+endif
+
+
+#####################################################################
+# Dependencies
+#####################################################################
+
+ifdef inlinux
+LIBDIR=/usr/lib/gcc-lib/i486-linux/2.7.2.3
+endif
+
+all:
+	$(MAKE) -C text all
+
+gdb:
+	$(MAKE) -C text all GDB=1
+
+full:
+	$(MAKE) -C text all FULL=1
+
+fullgdb:
+	$(MAKE) -C text all FULL=1 GDB=1
+
+# This is necessary because we don't have all units separate in the
+# units targets
+clean:
+	$(MAKE) -C fake clean
+	$(MAKE) -C text clean
+
+
+#
+# Installation
+#
+install:
+	$(MAKE) -C fake install
+	$(MAKE) -C fake install
+
+zipinstall:
+	$(MAKE) -C fake zipinstall
+	$(MAKE) -C fake zipinstall
+
+#
+# Misc
+#
+clean_compiler:
+	make -C ../../compiler clean
+
+#
+# $Log$
+# Revision 1.1  1999-04-16 20:16:38  michael
+# + Adapted ide Makefiles
+#
+# Revision 1.14  1999/03/16 00:47:00  peter
+#   * makefile.fpc targets start with fpc_
+#   * small updates for install scripts
+#
+# Revision 1.13  1999/03/09 01:35:52  peter
+#   * makefile.fpc updates and defaultfpcdir var
+#
+#
diff --git a/ide/fake/Makefile b/ide/fake/Makefile
new file mode 100644
index 0000000000..968a332f09
--- /dev/null
+++ b/ide/fake/Makefile
@@ -0,0 +1,112 @@
+#
+#   $Id$
+#   Copyright (c) 1998 by the Free Pascal Development Team
+#
+#   Makefile for Free Pascal Environment
+#
+#   See the file COPYING.FPC, included in this distribution,
+#   for details about the copyright.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+#####################################################################
+# Defaults
+#####################################################################
+
+# Default place of the makefile.fpc
+DEFAULTFPCDIR=../..
+
+#####################################################################
+# Common targets
+#####################################################################
+
+.PHONY: all clean install info \
+        staticlib sharedlib libsclean \
+        staticinstall sharedinstall libinstall \
+        
+info: testfpcmake fpc_info
+
+staticlib: testfpcmake fpc_staticlib
+
+sharedlib: testfpcmake fpc_sharedlib
+
+libsclean: testfpcmake fpc_libsclean
+
+staticinstall: testfpcmake fpc_staticinstall
+
+sharedinstall: testfpcmake fpc_sharedinstall
+
+libinstall: testfpcmake fpc_libinstall
+
+
+#####################################################################
+# Include default makefile
+#####################################################################
+
+# test if FPCMAKE is still valid
+ifdef FPCMAKE
+ifeq ($(strip $(wildcard $(FPCMAKE))),)
+FPCDIR=
+FPCMAKE=
+endif
+endif
+
+ifndef FPCDIR
+ifdef DEFAULTFPCDIR
+FPCDIR=$(DEFAULTFPCDIR)
+endif
+endif
+
+ifndef FPCMAKE
+ifdef FPCDIR
+FPCMAKE=$(FPCDIR)/makefile.fpc
+else
+FPCMAKE=makefile.fpc
+endif
+endif
+
+override FPCMAKE:=$(strip $(wildcard $(FPCMAKE)))
+ifeq ($(FPCMAKE),)
+testfpcmake:
+	@echo makefile.fpc not found!
+	@echo Check the FPCMAKE and FPCDIR environment variables.
+	@exit
+else
+include $(FPCMAKE)
+
+testfpcmake:
+endif
+
+
+#####################################################################
+# Dependencies
+#####################################################################
+
+all: 
+	$(MAKE) -C compiler all
+	$(MAKE) -C gdb all 
+
+clean :
+	$(MAKE) -C compiler clean
+	$(MAKE) -C gdb clean
+
+install:
+	$(MAKE) -C compiler install
+	$(MAKE) -C gdb install
+
+#
+# $Log$
+# Revision 1.1  1999-04-16 20:16:38  michael
+# + Adapted ide Makefiles
+#
+# Revision 1.14  1999/03/16 00:47:00  peter
+#   * makefile.fpc targets start with fpc_
+#   * small updates for install scripts
+#
+# Revision 1.13  1999/03/09 01:35:52  peter
+#   * makefile.fpc updates and defaultfpcdir var
+#
+#
diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile
new file mode 100644
index 0000000000..806162e5aa
--- /dev/null
+++ b/ide/fake/compiler/Makefile
@@ -0,0 +1,130 @@
+#
+#   $Id$
+#   Copyright (c) 1999 by the Free Pascal Development Team
+#
+#   Makefile for <template> for Free Pascal
+#
+#   See the file COPYING.FPC, included in this distribution,
+#   for details about the copyright.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+
+#####################################################################
+# Defaults
+#####################################################################
+
+# Where are the include files located
+INC=
+PROCINC=
+OSINC=
+
+# Needed options, without it won't compile
+NEEDOPT=
+
+# Needed unit dir, which is searched as the first path
+NEEDUNITDIR=
+
+# Where need we to place the executables/ppu/objects
+TARGETDIR=
+UNITTARGETDIR=
+
+# As default make only the units
+#DEFAULTUNITS=1
+
+
+#####################################################################
+# Real targets
+#####################################################################
+
+UNITOBJECTS=browcol compiler systems version comphook globtype tokens
+EXEOBJECTS=
+
+
+#####################################################################
+# Common targets
+#####################################################################
+
+.PHONY: all clean install info \
+        staticlib sharedlib libsclean \
+        staticinstall sharedinstall libinstall \
+        
+all: testfpcmake fpc_all
+
+clean: testfpcmake fpc_clean
+
+info: testfpcmake fpc_info
+
+staticlib: testfpcmake fpc_staticlib
+
+sharedlib: testfpcmake fpc_sharedlib
+
+libsclean: testfpcmake fpc_libsclean
+
+# Empty targets. Nothing to install
+install:
+
+staticinstall:
+
+sharedinstall:
+
+libinstall:
+
+
+#####################################################################
+# Include default makefile
+#####################################################################
+
+# test if FPCMAKE is still valid
+ifdef FPCMAKE
+ifeq ($(strip $(wildcard $(FPCMAKE))),)
+FPCDIR=
+FPCMAKE=
+endif
+endif
+
+ifndef FPCDIR
+ifdef DEFAULTFPCDIR
+FPCDIR=$(DEFAULTFPCDIR)
+endif
+endif
+
+ifndef FPCMAKE
+ifdef FPCDIR
+FPCMAKE=$(FPCDIR)/makefile.fpc
+else
+FPCMAKE=makefile.fpc
+endif
+endif
+
+override FPCMAKE:=$(strip $(wildcard $(FPCMAKE)))
+ifeq ($(FPCMAKE),)
+testfpcmake:
+	@echo makefile.fpc not found!
+	@echo Check the FPCMAKE and FPCDIR environment variables.
+	@exit
+else
+include $(FPCMAKE)
+testfpcmake:
+endif
+
+
+
+#####################################################################
+# Dependencies
+#####################################################################
+
+install:
+
+#
+# $Log$
+# Revision 1.1  1999-04-16 20:16:38  michael
+# + Adapted ide Makefiles
+#
+# Revision 1.1  1999/03/16 00:50:29  peter
+#   + init
+#
+#
diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile
new file mode 100644
index 0000000000..034a51d26c
--- /dev/null
+++ b/ide/fake/gdb/Makefile
@@ -0,0 +1,130 @@
+#
+#   $Id$
+#   Copyright (c) 1999 by the Free Pascal Development Team
+#
+#   Makefile for <template> for Free Pascal
+#
+#   See the file COPYING.FPC, included in this distribution,
+#   for details about the copyright.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+
+#####################################################################
+# Defaults
+#####################################################################
+
+# Where are the include files located
+INC=
+PROCINC=
+OSINC=
+
+# Needed options, without it won't compile
+NEEDOPT=
+
+# Needed unit dir, which is searched as the first path
+NEEDUNITDIR=
+
+# Where need we to place the executables/ppu/objects
+TARGETDIR=
+UNITTARGETDIR=
+
+# As default make only the units
+#DEFAULTUNITS=1
+
+
+#####################################################################
+# Real targets
+#####################################################################
+
+UNITOBJECTS=gdbcon  gdbint
+EXEOBJECTS=
+
+
+#####################################################################
+# Common targets
+#####################################################################
+
+.PHONY: all clean install info \
+        staticlib sharedlib libsclean \
+        staticinstall sharedinstall libinstall \
+        
+all: testfpcmake fpc_all
+
+clean: testfpcmake fpc_clean
+
+info: testfpcmake fpc_info
+
+staticlib: testfpcmake fpc_staticlib
+
+sharedlib: testfpcmake fpc_sharedlib
+
+libsclean: testfpcmake fpc_libsclean
+
+# Empty targets. Nothing to install
+install:
+
+staticinstall:
+
+sharedinstall:
+
+libinstall:
+
+
+#####################################################################
+# Include default makefile
+#####################################################################
+
+# test if FPCMAKE is still valid
+ifdef FPCMAKE
+ifeq ($(strip $(wildcard $(FPCMAKE))),)
+FPCDIR=
+FPCMAKE=
+endif
+endif
+
+ifndef FPCDIR
+ifdef DEFAULTFPCDIR
+FPCDIR=$(DEFAULTFPCDIR)
+endif
+endif
+
+ifndef FPCMAKE
+ifdef FPCDIR
+FPCMAKE=$(FPCDIR)/makefile.fpc
+else
+FPCMAKE=makefile.fpc
+endif
+endif
+
+override FPCMAKE:=$(strip $(wildcard $(FPCMAKE)))
+ifeq ($(FPCMAKE),)
+testfpcmake:
+	@echo makefile.fpc not found!
+	@echo Check the FPCMAKE and FPCDIR environment variables.
+	@exit
+else
+include $(FPCMAKE)
+testfpcmake:
+endif
+
+
+
+#####################################################################
+# Dependencies
+#####################################################################
+
+install:
+
+#
+# $Log$
+# Revision 1.1  1999-04-16 20:16:38  michael
+# + Adapted ide Makefiles
+#
+# Revision 1.1  1999/03/16 00:50:29  peter
+#   + init
+#
+#