From cac8327c29092e15167f5751f6054ee3d232087e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 3 Feb 2011 08:47:48 +0000
Subject: [PATCH] 2011-02-03 09:47 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * INSTALL     + Minix additions.

  * config/global.mk
    ! Added missing 'else' after prev.
---
 harbour/ChangeLog             |  8 ++++++++
 harbour/INSTALL               |  8 ++++++++
 harbour/config/global.mk      |  1 +
 harbour/utils/hbmk2/hbmk2.prg | 10 +++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8917cf6d83..f1f03adb75 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-03 09:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * INSTALL
+    + Minix additions.
+
+  * config/global.mk
+    ! Added missing 'else' after prev.
+
 2011-02-03 09:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbthread.h
   * include/hbdefs.h
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 936906b1f8..dbb673fdce 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -514,6 +514,7 @@ HARBOUR
    qnx      - QNX
    vxworks  - VxWorks
    symbian  - Symbian OS (experimental)
+   minix    - Minix
    win      - MS Windows (all flavors)
               (see LINKS section for Win9x requirements)
    wce      - MS Windows CE
@@ -565,6 +566,11 @@ HARBOUR
    -------
    gcc      - GNU C
 
+   minix
+   -------
+   gcc      - GNU C
+   ack      - Amsterdam Compiler Kit
+
    cygwin
    ------
    gcc      - GNU C
@@ -1400,6 +1406,8 @@ HARBOUR
    x hpux   -> wce/mingw     x86
    x hpux   -> win/mingw     x86
    x hpux   -> dos/djgpp     x86
+     minix  -> minix/gcc     x86
+     minix  -> minix/ack     x86
      sunos  -> sunos/gcc     (CPU cross-builds possible)
      sunos  -> sunos/sunpro  (CPU cross-builds possible: x86, x86-64, sparc32, sparc64)
    x sunos  -> wce/mingwarm  arm
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index dc133edecf..9e361cdbbd 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1390,6 +1390,7 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
       else
       ifeq ($(HB_PLATFORM),cygwin)
          HB_PRGFLAGS += -D__PLATFORM__CYGWIN -D__PLATFORM__UNIX
+      else
       ifeq ($(HB_PLATFORM),minix)
          HB_PRGFLAGS += -D__PLATFORM__MINIX -D__PLATFORM__UNIX
       endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 14fb38cbdb..293649e877 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3039,7 +3039,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 #endif
 
       DO CASE
-      CASE HBMK_ISPLAT( "darwin|bsd|linux|hpux|beos|qnx|vxworks|sunos" )
+      CASE HBMK_ISPLAT( "darwin|bsd|linux|hpux|beos|qnx|vxworks|sunos|minix" )
          IF Empty( cPrefix )
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cPostfix,;
                                                       "harbour"   + cPostfix ) }
@@ -10051,6 +10051,9 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
       CASE hbmk[ _HBMK_cPLAT ] == "cygwin"
          AAdd( aDf, "__PLATFORM__CYGWIN" )
          AAdd( aDf, "__PLATFORM__UNIX" )
+      CASE hbmk[ _HBMK_cPLAT ] == "minix"
+         AAdd( aDf, "__PLATFORM__MINIX" )
+         AAdd( aDf, "__PLATFORM__UNIX" )
       ENDCASE
 
       /* Setup those CPU flags which we can be sure about.
@@ -11081,7 +11084,7 @@ FUNCTION hbmk_KEYW( hbmk, cKeyword, cValue, cOperator )
    CASE "static"   ; RETURN ! hbmk[ _HBMK_lSHARED ]
    CASE "unicode"  ; RETURN hbmk[ _HBMK_lUNICODE ]
    CASE "ascii"    ; RETURN ! hbmk[ _HBMK_lUNICODE ]
-   CASE "unix"     ; RETURN HBMK_ISPLAT( "bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|darwin|cygwin" )
+   CASE "unix"     ; RETURN HBMK_ISPLAT( "bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|darwin|cygwin|minix" )
    CASE "allwin"   ; RETURN HBMK_ISPLAT( "win|wce" )
    CASE "allgcc"   ; RETURN HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|gccomf|clang|open64" )
    CASE "allmingw" ; RETURN HBMK_ISCOMP( "mingw|mingw64|mingwarm" )
@@ -11102,7 +11105,7 @@ FUNCTION hbmk_KEYW( hbmk, cKeyword, cValue, cOperator )
    ENDIF
 
    IF ! HBMK_IS_IN( cKeyword, "|win|wce|dos|os2" + ;
-                              "|bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|darwin|cygwin" + ;
+                              "|bsd|hpux|sunos|beos|qnx|vxworks|symbian|linux|darwin|cygwin|minix" + ;
                               "|msvc|msvc64|msvcia64|msvcarm" + ;
                               "|pocc|pocc64|poccarm|xcc" + ;
                               "|mingw|mingw64|mingwarm|bcc|watcom" + ;
@@ -11861,6 +11864,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       "  - vxworks : gcc, diab",;
       "  - symbian : gcc",;
       "  - cygwin  : gcc",;
+      "  - minix   : gcc",;
       "  - sunos   : gcc, sunpro" }
 
    LOCAL aOpt_Basic := {;