--- Merging r29567 into '.':

U    packages/rtl-unicode/fpmake.pp
--- Merging r29568 into '.':
U    utils/unicode/fpmake.pp
--- Merging r29571 into '.':
U    rtl/os2/sysucode.inc
--- Merging r29572 into '.':
U    rtl/os2/system.pas
U    rtl/os2/sysos.inc
G    rtl/os2/sysucode.inc
--- Merging r29573 into '.':
U    compiler/systems/t_os2.pas
--- Merging r29618 into '.':
G    utils/unicode/fpmake.pp
--- Merging r29620 into '.':
U    installer/install.dat
--- Merging r29623 into '.':
U    rtl/objpas/fpwidestring.pp
--- Merging r29625 into '.':
G    rtl/os2/sysucode.inc
--- Merging r29629 into '.':
G    rtl/os2/sysucode.inc
--- Merging r29630 into '.':
U    packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29631 into '.':
G    packages/fcl-db/src/dbase/dbf_wos2.inc
--- Merging r29632 into '.':
U    packages/fcl-db/src/dbase/dbf_common.inc
U    packages/fcl-db/src/dbase/dbf_common.pas

# revisions: 29567,29568,29571,29572,29573,29618,29620,29623,29625,29629,29630,29631,29632


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@29634 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 2 insertions, 6 deletions

diff --git a/utils/unicode/fpmake.pp b/utils/unicode/fpmake.pp
index c307b87ded..8ca5f684e1 100644
--- a/utils/unicode/fpmake.pp
+++ b/utils/unicode/fpmake.pp
@@ -15,7 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-unicode');
-    P.ShortName:='unicode';
+    P.ShortName:='ucode';
 
     P.Author := 'Inoussa OUEDRAOGO';
     P.License := 'LGPL with modification';
@@ -30,7 +30,7 @@ begin
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');
 
-    P.OSes:=[win32, win64, linux, darwin];
+    P.OSes:=[win32, win64, linux, darwin, os2, emx];
 
     T := P.Targets.AddImplicitUnit('helper.pas');
     T.ResourceStrings := true;
@@ -66,7 +66,3 @@ begin
   Installer.Run;
 end.
 {$endif ALLPACKAGES}
-
-
-
-