From 5f71a149bacd9c6409ca2f1ebfb77e44fd3fb221 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 Aug 2009 15:24:16 +0000
Subject: [PATCH] 2009-08-27 17:21 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/linux/sunpro.mk   * config/sunos/sunpro.mk     + Added
 HB_CCPATH, HB_CCPREFIX and HB_CCPOSTFIX support for CC and LD.     - Deleted
 HB_CCPREFIX from linux/sunpro AR command.

  * config/global.mk
    * Updated comments.
---
 harbour/ChangeLog              | 9 +++++++++
 harbour/config/global.mk       | 6 +++---
 harbour/config/linux/sunpro.mk | 6 +++---
 harbour/config/sunos/sunpro.mk | 4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 64e358ce25..853def2374 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 17:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/linux/sunpro.mk
+  * config/sunos/sunpro.mk
+    + Added HB_CCPATH, HB_CCPREFIX and HB_CCPOSTFIX support for CC and LD.
+    - Deleted HB_CCPREFIX from linux/sunpro AR command.
+
+  * config/global.mk
+    * Updated comments.
+
 2009-08-27 14:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/Makefile
   * source/rtl/gtgui/Makefile
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index e4415c4136..6e8c7f0bc4 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -266,15 +266,15 @@ ifeq ($(HB_INIT_DONE),)
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
       #
       #   HB_DLLIBS                   -> (only used in place location, so it's a local matter)
-      #   HB_CRS_LIB                  -> HB_LIB_CURSES
-      #   HB_DIR_*                    -> ? (only used for implib and a few .hbm files)
+      #   HB_CRS_LIB                  -> HB_LIBNAME_CURSES
+      #   HB_DIR_*                    -> HB_LIBDIR_* ? (only used for implib and a few .hbm files)
       #
       #   HB_GPM_NOICE_DISABLE        -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE
       #   HB_GT_CRS_BCEHACK           -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
       #   HB_NCURSES_194              -> HB_USER_CFLAGS=-DHB_NCURSES_194
       #
       # Macros:
-      #   -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM, -DHB_GT_LIB=
+      #   -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_GT_LIB=
 
       $(info ! Building Harbour $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS) from source - http://www.harbour-project.org)
       $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(SHELL) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(if $(MAKESHELL),MAKESHELL: $(MAKESHELL),))
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 76db777173..570d39fc47 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -12,7 +12,7 @@ OBJ_EXT := .o
 LIB_PREF := lib
 LIB_EXT := .a
 
-CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
+CC := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 # NOTE: The ending space after -o is important, please preserve it.
 #       Now solved with '$(subst x,x, )' expression.
@@ -59,7 +59,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
+LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )
 
 LIBPATHS := $(LIB_DIR)
@@ -67,7 +67,7 @@ LIBPATHS := $(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
 LDFLAGS += $(foreach dir,$(LIBPATHS) $(SYSLIBPATHS),-L$(dir))
 
-AR := $(HB_CCPREFIX)ar
+AR := ar
 ARFLAGS :=
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 23130bdf64..6206436a7f 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -12,7 +12,7 @@ OBJ_EXT := .o
 LIB_PREF := lib
 LIB_EXT := .a
 
-CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
+CC := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 # NOTE: The ending space after -o is important, please preserve it.
 #       Now solved with '$(subst x,x, )' expression.
@@ -65,7 +65,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
+LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o$(subst x,x, )
 
 LIBPATHS := $(LIB_DIR)