--- Merging r39756 and r39757 into 'fixes_3_2' branch:

U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r39756 into '.':
 U   .
U    utils/fpcm/fpcmake.inc
U    utils/fpcm/fpcmake.ini
--- Recording mergeinfo for merge of r39757 into '.':
 G   .
-------------------------------------------------------------------------
r39756 | pierre | 2018-09-14 16:06:27 +0200 (Fri, 14 Sep 2018) | 1 line

 Add AIXSharedLibExt to avoid failure on pas2js shared library installation for AIX OS
------------------------------------------------------------------------
------------------------------------------------------------------------
r39757 | pierre | 2018-09-14 16:07:38 +0200 (Fri, 14 Sep 2018) | 1 line

 Add SHAREDLIBEXT=.a for AIX OS to fpcmake.ini
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@39766 -

packages/fpmkunit/src/fpmkunit.pp

@@ -240,6 +240,7 @@ Const
   SharedLibExt = '.so';
   DyLibExt = '.dylib';
   DLLExt  = '.dll';
+  AIXSharedLibExt = '.a';
   ExeExt  = '.exe';
   DbgExt  = '.dbg';
   ZipExt  = '.zip';
@@ -2626,6 +2627,8 @@ begin
     Result:=LibraryName+DLLExt
   else if aOS in [darwin,macos,iphonesim] then
     Result:=LibraryName+DyLibExt
+  else if aOS = Aix then
+    Result:=LibraryName+AIXSharedLibExt
   else
     Result:=LibraryName+SharedLibExt;
 end;

utils/fpcm/fpcmake.ini

@@ -1104,6 +1104,7 @@ endif
 ifeq ($(OS_TARGET),aix)
 BATCHEXT=.sh
 EXEEXT=
+SHAREDLIBEXT=.a
 SHORTSUFFIX=aix
 endif