Browse Source

Change the test for GNU make version 4 so that gmake lines are also discarded (needed for systems using GNU make as gmake executable)

git-svn-id: branches/fixes_3_0@39537 -
pierre 7 years ago
parent
commit
03707fc453
1 changed files with 3 additions and 2 deletions
  1. 3 2
      tests/utils/gparmake.pp

+ 3 - 2
tests/utils/gparmake.pp

@@ -133,8 +133,9 @@ Function ProcessArgs: longint;
                 readln(responsefile,s);
                 { Avoid problem with GNU make version 4
                   which adds lines containing
-                  make[X] Entering/leaving ... }
-                if not (copy(s,1,5)='make[') then
+                  make[X] Entering/leaving ...
+                  Modified to also accept gmake }
+                if pos('make[',s)=0 then
                   AddFile(s);
               end;
             close(responsefile);