diff -ruN --exclude=CVS flexcat-2.4/Catalogs_Src/FlexCat_english.texinfo flexcat/Catalogs_Src/FlexCat_english.texinfo
--- flexcat-2.4/Catalogs_Src/FlexCat_english.texinfo  Wed Aug 18 16:33:00 1999
+++ flexcat/Catalogs_Src/FlexCat_english.texinfo  Fri Feb  8 18:19:23 2002
@@ -1,10 +1,15 @@
 \input amigatexinfo
 \input texinfo
 @c %**start of header
-@setfilename FlexCat_english.guide
+@c @setfilename FlexCat_english.guide
 @settitle FlexCat @value{VERSION}    Documentation
 @setchapternewpage off
 
+@dircategory GeekGadgets programming tools
+@direntry
+* FlexCat: (flexcat).            The flexible catalog generator.
+@end direntry
+
 @c  $VER: FlexCat_english.texinfo 2.4
 @c
 @c  FlexCat:                  The flexible catalog generator
@@ -1587,15 +1592,15 @@
 
      @item Italian translation reworked by Luca Nora <ln546991@@silab.dsi.unimi.it> and Giovanni Addabbo <gaddabbo@@imar.net>
 
-         @item Slovenian translation by Damir Arh <damir.arh@guest.arnes.si>
+         @item Slovenian translation by Damir Arh <damir.arh@@guest.arnes.si>
 
-         @item Dutch translation updated by Leon Woestenberg <leon@stack.nl>
+         @item Dutch translation updated by Leon Woestenberg <leon@@stack.nl>
 
 @end table
 
-@item Christian Hattemer <chris@heaven.riednet.wh.tu-darmstadt.de> for StormC source descriptors and updating german catalog
+@item Christian Hattemer <chris@@heaven.riednet.wh.tu-darmstadt.de> for StormC source descriptors and updating german catalog
 
-@item Sven Steiniger <ss37@irz301.inf.tu-dresden.de> for the new source descriptor for E programmers (E32e.sd)
+@item Sven Steiniger <ss37@@irz301.inf.tu-dresden.de> for the new source descriptor for E programmers (E32e.sd)
       
 
 @end table
diff -ruN --exclude=CVS flexcat-2.4/flexcat.c flexcat/flexcat.c
--- flexcat-2.4/flexcat.c Sun Nov 28 04:25:26 1999
+++ flexcat/flexcat.c Sat Mar 16 20:36:33 2002
@@ -12,8 +12,6 @@
 /* $Id: flexcat.c,v 1.2 1999/11/28 03:36:38 carlos Exp $ */
 
 
-#define __amigados
-
 /// README
 /*
 
@@ -425,7 +423,7 @@
        int a = tolower( (int)*str1 );
        int b = tolower( (int)*str2 );
 
-       if( !a || !b )
+       if( !a && !b )
            break;
 
        if( a != b )
diff -ruN --exclude=CVS flexcat-2.4/smakefile flexcat/smakefile
--- flexcat-2.4/smakefile Sun Nov 28 04:35:12 1999
+++ flexcat/smakefile Sat Mar 16 20:36:24 2002
@@ -8,7 +8,7 @@
        CommentNest ErrorRexx NoMultipleIncludes \
        NoIcons GenProtoParameters NoLink \
        MultipleCharacterConstants \
-       Optimize Opttime cpu=000
+       Optimize Opttime cpu=000 Def=__amigados
 
 MAIN     = FlexCat
 CATALOG  = FlexCat_cat.h