* also search path if not found in utilsdirectory

compiler/assemble.pas

@@ -151,12 +151,10 @@ begin
      lastas:=ord(target_asm.id);
      { is an assembler passed ? }
      if utilsdirectory<>'' then
-         begin
-            LastASBin:=Search(target_asm.asmbin+source_os.exeext,
-              utilsdirectory,asfound)+target_asm.asmbin+source_os.exeext;
-         end
-       else
-         LastASBin:=FindExe(target_asm.asmbin,asfound);
+       LastASBin:=Search(target_asm.asmbin+source_os.exeext,utilsdirectory,asfound)+
+         target_asm.asmbin+source_os.exeext;
+     if LastASBin='' then
+       LastASBin:=FindExe(target_asm.asmbin,asfound);
      if (not asfound) and not(cs_asm_extern in aktglobalswitches) then
       begin
         Message1(exec_w_assembler_not_found,LastASBin);
@@ -549,7 +547,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.48  1999-05-27 19:44:03  peter
+  Revision 1.48.2.1  1999-06-28 15:55:39  peter
+    * also search path if not found in utilsdirectory
+
+  Revision 1.48  1999/05/27 19:44:03  peter
     * removed oldasm
     * plabel -> pasmlabel
     * -a switches to source writing automaticly

compiler/link.pas

@@ -163,11 +163,9 @@ begin
   if LastLDBin='' then
    begin
      if utilsdirectory<>'' then
-       begin
-          LastLDBin:=Search(target_link.linkbin+source_os.exeext,
-            utilsdirectory,ldfound)+target_link.linkbin+source_os.exeext;
-       end
-     else
+       LastLDBin:=Search(target_link.linkbin+source_os.exeext,utilsdirectory,ldfound)+
+         target_link.linkbin+source_os.exeext;
+     if LastLDBin='' then
        LastLDBin:=FindExe(target_link.linkbin,ldfound);
      if (not ldfound) and not(cs_link_extern in aktglobalswitches) then
       begin
@@ -654,7 +652,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.54.2.2  1999-06-18 09:51:55  peter
+  Revision 1.54.2.3  1999-06-28 15:55:40  peter
+    * also search path if not found in utilsdirectory
+
+  Revision 1.54.2.2  1999/06/18 09:51:55  peter
     * always use shell() for go32v2 to support LFN
 
   Revision 1.54.2.1  1999/06/15 13:51:56  peter