From 72d83013295ed2e7bd10fcf32e23e0e748cd6a5b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 7 Aug 2010 17:45:00 +0000
Subject: [PATCH] 2010-08-07 19:40 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/make.hbs     ! Fixed to not propagate custom flags to
 container projects.

  * config/global.mk
    ! Changed realpath to abspath.
---
 harbour/ChangeLog        |  7 +++++++
 harbour/config/global.mk |  2 +-
 harbour/contrib/make.hbs | 23 +++++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d836a620dd..9745fdc762 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-07 19:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    ! Fixed to not propagate custom flags to container projects.
+
+  * config/global.mk
+    ! Changed realpath to abspath.
+
 2010-08-07 17:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/gtalleg/gtalleg.hbc
     ! Fixed allegro-config command to not contain output redirection.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index d216ef6830..7160ea4ab1 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1145,7 +1145,7 @@ else
       ifneq ($(HB_SRC_ROOTPATH),)
          export LD_LIBRARY_PATH := $(HB_SRC_ROOTPATH)lib/$(PLAT_COMP):$(LD_LIBRARY_PATH)
       else
-         export LD_LIBRARY_PATH := $(realpath $(DYN_DIR)):$(LD_LIBRARY_PATH)
+         export LD_LIBRARY_PATH := $(abspath $(DYN_DIR)):$(LD_LIBRARY_PATH)
       endif
       export HB_LD_PATH_SET := yes
       ifneq ($(LD_LIBRARY_PATH),)
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index a422ff3db9..31947bb1a2 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -426,7 +426,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
       IF cProject $ hProjectList
 
          cProjectPath := s_cBase + s_cHome + cProject
-         lPrimary := cProject $ hProjectReqList .OR. "lFromContainer" $ hProjectList[ cProject ]
+         lPrimary := cProject $ hProjectReqList
 
          IF call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), NIL )
 
@@ -445,15 +445,18 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
                call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), cDynSuffix )
             ENDIF
 
-            /* Compile documentation */
-            IF lInstall .AND. lPrimary
-               mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) )
-            ENDIF
+            IF lPrimary .OR. "lFromContainer" $ hProjectList[ cProject ]
 
-            /* Create EXTERN list */
-            IF lPrimary .AND. hProjectList[ cProject ][ "cType" ] $ "hblib|hbdyn"
-               mk_extern_lib( PathSepToSelf( hProjectList[ cProject ][ "cOutputName" ] ),;
-                              FNameExtSet( PathSepToSelf( cProjectPath ), ".hbx" ) )
+               /* Compile documentation */
+               IF lInstall
+                  mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) )
+               ENDIF
+
+               /* Create EXTERN list */
+               IF hProjectList[ cProject ][ "cType" ] $ "hblib|hbdyn"
+                  mk_extern_lib( PathSepToSelf( hProjectList[ cProject ][ "cOutputName" ] ),;
+                                 FNameExtSet( PathSepToSelf( cProjectPath ), ".hbx" ) )
+               ENDIF
             ENDIF
          ENDIF
       ENDIF
@@ -536,7 +539,7 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, cDynSuffix, cStdErr, cStd
    ENDIF
 
    cCommand := s_cBinDir + "hbmk2" +;
-               " -quiet -width=0 -shl" +;
+               " -quiet -width=0" +;
                " @" + StrTran( s_cHome + "hbpre", "\", "/" ) +;
                cOptionsPre +;
                " " + StrTran( cProjectPath, "\", "/" ) +;