* fixed path with staticlib/objects in ppufiles

compiler/files.pas

@@ -611,7 +611,7 @@ unit files;
          { lib and exe could be loaded with a file specified with -o }
          if AllowOutput and (OutputFile<>'') then
           n:=OutputFile;
-         staticlibfilename:=stringdup(target_os.libprefix+n+target_os.staticlibext);
+         staticlibfilename:=stringdup(p+target_os.libprefix+n+target_os.staticlibext);
          sharedlibfilename:=stringdup(p+target_os.libprefix+n+target_os.sharedlibext);
          { output dir of exe can be specified separatly }
          if AllowOutput and (OutputExeDir<>'') then
@@ -1021,7 +1021,10 @@ unit files;
 end.
 {
   $Log$
-  Revision 1.63  1998-10-14 11:02:49  daniel
+  Revision 1.64  1998-10-14 13:38:19  peter
+    * fixed path with staticlib/objects in ppufiles
+
+  Revision 1.63  1998/10/14 11:02:49  daniel
   * Stupid typo fixed.
 
   Revision 1.62  1998/10/14 10:59:37  daniel

compiler/link.pas

@@ -462,7 +462,7 @@ begin
      aktglobalswitches:=aktglobalswitches+[cs_link_extern];
    end;
   s:=target_ar.arcmd;
-  Replace(s,'$LIB',current_module^.path^+current_module^.staticlibfilename^);
+  Replace(s,'$LIB',current_module^.staticlibfilename^);
   if filescnt=0 then
    Replace(s,'$FILES',current_module^.objfilename^)
   else
@@ -499,7 +499,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.32  1998-10-14 11:03:55  daniel
+  Revision 1.33  1998-10-14 13:38:22  peter
+    * fixed path with staticlib/objects in ppufiles
+
+  Revision 1.32  1998/10/14 11:03:55  daniel
   * Forgot to dereference a pointer.
 
   Revision 1.31  1998/10/14 11:01:21  daniel

compiler/symppu.inc

@@ -72,7 +72,7 @@
       end;
 
 
-    procedure writecontainer(var p:tstringcontainer;id:byte;hold:boolean);
+    procedure writecontainer(var p:tstringcontainer;id:byte;hold,strippath:boolean);
       var
         hcontainer : tstringcontainer;
         s          : string;
@@ -82,7 +82,10 @@
         while not p.empty do
          begin
            s:=p.get;
-           current_ppu^.putstring(s);
+           if strippath then
+            current_ppu^.putstring(SplitFileName(s))
+           else
+            current_ppu^.putstring(s);
            if hold then
             hcontainer.insert(s);
          end;
@@ -443,7 +446,10 @@
 
 {
   $Log$
-  Revision 1.21  1998-10-14 10:45:10  pierre
+  Revision 1.22  1998-10-14 13:38:24  peter
+    * fixed path with staticlib/objects in ppufiles
+
+  Revision 1.21  1998/10/14 10:45:10  pierre
     * ppu problems for m68k fixed (at least in cross compiling)
     * one last memory leak for sysamiga fixed
     * the amiga RTL compiles now completely !!