From fdbdedd298bfaba1b036bc6faf78a8731d3f6d49 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 2 Jan 2010 16:09:44 +0000
Subject: [PATCH] 2010-01-02 17:06 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     * Clean Linux .rpm section, added full install
 commands just       like for Ubuntu, added qt45-devel, added more
 description.       (not tested, I don't have .rpm based distro)

  * config/global.mk
    ! Fixed debian package manager detection, as suggest by
      Tamas Tevesz.
---
 harbour/ChangeLog        | 10 +++++++++
 harbour/INSTALL          | 45 ++++++++++++++++++++++++++--------------
 harbour/config/global.mk |  9 +-------
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b4390a6e22..a0f87d295a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-02 17:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    * Clean Linux .rpm section, added full install commands just
+      like for Ubuntu, added qt45-devel, added more description.
+      (not tested, I don't have .rpm based distro)
+
+  * config/global.mk
+    ! Fixed debian package manager detection, as suggest by
+      Tamas Tevesz.
+
 2010-01-02 15:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + Added rudamentary package manager detection (so far for
diff --git a/harbour/INSTALL b/harbour/INSTALL
index c0c7e59b1c..afed6d2636 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -365,8 +365,8 @@ HARBOUR
    ------------------------------------------
    (tested with Ubuntu 7.04, 8.04, 9.04, 9.10)
 
-      for zlib support:          $ sudo apt-get install zlib1g-dev
-      for pcre (regex) support:  $ sudo apt-get install libpcre3-dev
+      You'll need these packages to compile certain contribs and optional Harbour features:
+
       for gtcrs terminal lib:    $ sudo apt-get install libncurses-dev
       for gtsln terminal lib:    $ sudo apt-get install libslang2-dev OR
                                  $ sudo apt-get install libslang1-dev
@@ -386,6 +386,11 @@ HARBOUR
       for contrib/hbodbc lib:    $ sudo apt-get install unixodbc-dev
       for contrib/hbpgsql lib:   $ sudo apt-get install libpq-dev
       for contrib/hbqt lib:      $ sudo apt-get install libqt4-dev
+
+      Optional, to override locally hosted sources:
+
+      for zlib support:          $ sudo apt-get install zlib1g-dev
+      for pcre (regex) support:  $ sudo apt-get install libpcre3-dev
       for contrib/hbsqlit3 lib:  $ sudo apt-get install libsqlite3-dev
 
    Linux (openSUSE, .rpm based distros)
@@ -393,19 +398,29 @@ HARBOUR
 
       You'll need these packages to compile certain contribs and optional Harbour features:
 
-      - xorg-x11-devel OR XFree86-devel
-      - postgresql-devel
-      - firebird-devel
-      - freeimage-devel
-      - ncurses-devel AND ncurses
-      - slang-devel AND slang
-      - unixodbc-devel OR unixODBC-devel
-      - gd-devel
-      - libmysqlclient-devel OR mysql-devel OR MySQL-devel
-      - allegro-devel
-      - cairo-devel
-      - curl-devel
-      - gpm-devel
+      for gtcrs terminal lib:    $ sudo rpm -i ncurses-devel ncurses
+      for gtsln terminal lib:    $ sudo rpm -i slang-devel slang
+      for gtxwc terminal lib:    $ sudo rpm -i xorg-x11-devel OR
+                                 $ sudo rpm -i XFree86-devel
+      for console mouse support: $ sudo rpm -i gpm-devel
+      for contrib/gtalleg lib:   $ sudo rpm -i allegro-devel
+      for contrib/hbcairo lib:   $ sudo rpm -i cairo-devel
+      for contrib/hbcurl lib:    $ sudo rpm -i curl-devel
+      for contrib/hbfbird lib:   $ sudo rpm -i firebird-devel
+      for contrib/hbfimage lib:  $ sudo rpm -i freeimage-devel
+      for contrib/hbgd lib:      $ sudo rpm -i gd-devel
+      for contrib/hbmysql lib:   $ sudo rpm -i libmysqlclient-devel OR
+                                 $ sudo rpm -i mysql-devel OR
+                                 $ sudo rpm -i MySQL-devel
+      for contrib/hbodbc lib:    $ sudo rpm -i unixodbc-devel OR
+                                 $ sudo rpm -i unixODBC-devel
+      for contrib/hbpgsql lib:   $ sudo rpm -i postgresql-devel
+      for contrib/hbqt lib:      $ sudo rpm -i qt45-devel
+
+   OpenSolaris
+   -----------
+
+      - $ pkg install SUNWgmake
 
    FreeBSD
    -------
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 39618b1742..3699d0ea0f 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1054,14 +1054,7 @@ ifeq ($(HB_HOST_PKGM),)
          HB_HOST_PKGM += macports
       endif
    else ifeq ($(HB_PLATFORM),linux)
-      _UNAME_V := $(shell uname -v)
-      ifneq      ($(findstring Ubuntu,$(_UNAME_V)),)
-         HB_HOST_PKGM += deb
-      else ifneq ($(findstring ubuntu,$(_UNAME_V)),)
-         HB_HOST_PKGM += deb
-      else ifneq ($(findstring Debian,$(_UNAME_V)),)
-         HB_HOST_PKGM += deb
-      else ifneq ($(findstring debian,$(_UNAME_V)),)
+      ifneq ($(wildcard /etc/debian_version),)
          HB_HOST_PKGM += deb
       else
          HB_HOST_PKGM += rpm