diff --git a/ide/fp.pas b/ide/fp.pas
index 712110a21a..623995afe2 100644
--- a/ide/fp.pas
+++ b/ide/fp.pas
@@ -266,6 +266,7 @@ const
 
 procedure InterceptExit;
 begin
+{$IFDEF HasSignal}  
   if StopJmpValid then
     begin
       ExitIntercepted:=true;
@@ -273,6 +274,7 @@ begin
       SeenErrorAddr:=ErrorAddr;
       LongJmp(StopJmp,1);
     end;
+{$ENDIF}
 end;
 
 BEGIN
@@ -339,7 +341,9 @@ BEGIN
     from command line PM }
   ParseUserScreen;
 
+{$IFDEF HasSignal}
   EnableCatchSignals;
+{$ENDIF}
   { Update IDE }
   IDEApp.Update;
   IDEApp.UpdateMode;
@@ -357,8 +361,10 @@ BEGIN
   ExitProc:=@InterceptExit;
 
   repeat
-    SetJmpRes:=setjmp(StopJmp);
-    StopJmpValid:=true;
+{$IFDEF HasSignal}  
+     SetJmpRes:=setjmp(StopJmp);
+     StopJmpValid:=true;
+{$ENDIF}    
     UserWantsToGoOn:=false;
 
     if SetJmpRes=0 then
@@ -404,7 +410,9 @@ BEGIN
       CanExit:=IDEApp.AskSaveAll
     else
       CanExit:=IDEApp.SaveAll;
-    StopJmpValid:=false;
+{$IFDEF HasSignal}      
+     StopJmpValid:=false;
+{$ENDIF}    
     if (SetJmpRes<>0) then
       begin
         if (not CanExit) or UserWantsToGoOn then
@@ -431,7 +439,9 @@ BEGIN
   IDEApp.Done;
   WriteSwitches(SwitchesPath);
 
-  DisableCatchSignals;
+{$IFDEF HasSignal}
+   DisableCatchSignals;
+{$ENDIF}  
 
   DoneCodeComplete;
   DoneCodeTemplates;
@@ -470,7 +480,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.13  2002-09-10 12:19:14  pierre
+  Revision 1.14  2002-10-12 19:43:07  hajny
+    * missing HasSignal conditionals added (needed for FPC/2)
+
+  Revision 1.13  2002/09/10 12:19:14  pierre
    * use faster method for loading files by default
 
   Revision 1.12  2002/09/09 06:59:16  pierre
diff --git a/ide/fpide.pas b/ide/fpide.pas
index 22ff8ccfe9..4ed9459de0 100644
--- a/ide/fpide.pas
+++ b/ide/fpide.pas
@@ -563,7 +563,11 @@ begin
 {$ifdef DEBUG}
   if (Event.What=evKeyDown) and (Event.KeyCode=kbAltF11) then
     begin
+{$ifdef HasSignal}
       Generate_SIGSEGV;
+{$else}
+      Halt(1);
+{$endif}
     end;
   if (Event.What=evKeyDown) and (Event.KeyCode=kbCtrlF11) then
     begin
@@ -871,7 +875,9 @@ begin
       { destory all help & browser windows - we don't want to store them }
       { UserScreenWindow is also not registered PM }
       DoCloseUserScreenWindow;
+      {$IFNDEF NODEBUG}
       DoneDisassemblyWindow;
+      {$ENDIF}
       CloseHelpWindows;
       CloseAllBrowsers;
       DOK:=SaveDesktop;
@@ -1217,7 +1223,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.21  2002-09-13 07:16:56  pierre
+  Revision 1.22  2002-10-12 19:43:07  hajny
+    * missing HasSignal conditionals added (needed for FPC/2)
+
+  Revision 1.21  2002/09/13 07:16:56  pierre
    * avoid RTE 201 if closing file with position outside integer bounds
 
   Revision 1.20  2002/09/09 06:58:51  pierre
diff --git a/ide/fpmfile.inc b/ide/fpmfile.inc
index 74d01a6b8b..cda85b51f7 100644
--- a/ide/fpmfile.inc
+++ b/ide/fpmfile.inc
@@ -170,8 +170,10 @@ begin
        if ConfirmBox(msg_confirmsourcediradd,@P,false)=cmYes then
          begin
            SourceDirs:=SourceDirs+';'+Dir;
+           {$IFNDEF NODEBUG}
            if assigned(Debugger) then
              Debugger^.SetDirectories;
+           {$ENDIF}
          end;
      OpenEditorWindow(nil,FileName,0,0);
    end;
@@ -221,7 +223,10 @@ end;
 
 {
   $Log$
-  Revision 1.6  2002-09-07 15:40:43  peter
+  Revision 1.7  2002-10-12 19:43:07  hajny
+    * missing HasSignal conditionals added (needed for FPC/2)
+
+  Revision 1.6  2002/09/07 15:40:43  peter
     * old logs removed and tabs fixed
 
   Revision 1.5  2002/08/29 09:58:04  pierre
diff --git a/ide/fpmrun.inc b/ide/fpmrun.inc
index 0e0ea568d3..51d1341247 100644
--- a/ide/fpmrun.inc
+++ b/ide/fpmrun.inc
@@ -49,12 +49,14 @@ begin
    begin
      if (MessageBox(#3+'You''ve edited a file, recompile the project?',nil,mfinformation+mfyesbutton+mfnobutton)=cmYes) then
       begin
+        {$IFNDEF NODEBUG}
         if Assigned(Debugger) then
           begin
             if Debugger^.IsRunning then
               RestartingDebugger:=true;
           end;
         DoResetDebugger;
+        {$ENDIF}
         DoRun;
         AskRecompileIfModified:=true;
       end
@@ -483,7 +485,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2002-09-07 15:40:44  peter
+  Revision 1.6  2002-10-12 19:43:07  hajny
+    * missing HasSignal conditionals added (needed for FPC/2)
+
+  Revision 1.5  2002/09/07 15:40:44  peter
     * old logs removed and tabs fixed
 
   Revision 1.4  2002/09/05 08:45:59  pierre