2010-07-05 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* utils/hbmk2/hbmk2.prg
    + Added support for -instpath in -hbimplib mode.
      This should fix missing implibs after recent make system rework.

  * contrib/makefile.hbs
    ! Fix to prev.

harbour/ChangeLog

@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-05 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added support for -instpath in -hbimplib mode.
+      This should fix missing implibs after recent make system rework.
+
+  * contrib/makefile.hbs
+    ! Fix to prev.
+
 2010-07-05 19:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmysql/hbmysql.hbp
   * contrib/hbct/hbct.hbp

harbour/contrib/makefile.hbs

@@ -239,8 +239,8 @@ PROCEDURE Main( ... )
    hb_setenv( "_HB_INC_INSTALL", GetEnv( "HB_INC_INSTALL" ) )
 
    hb_setenv( "HB_INSTALL_PREFIX", cRoot )
-   hb_setenv( "HB_BIN_INSTALL", cRoot + "bin/${hb_plat}/${hb_comp}" + iif( lBuildName, "/${hb_build}", "" ) )
-   hb_setenv( "HB_LIB_INSTALL", cRoot + "lib/${hb_plat}/${hb_comp}" + iif( lBuildName, "/${hb_build}", "" ) )
+   hb_setenv( "HB_BIN_INSTALL", cRoot + "bin/" + GetEnv( "HB_PLATFORM" ) + "/" + GetEnv( "HB_COMPILER" ) + iif( lBuildName, "/" + GetEnv( "HB_BUILD_NAME" ), "" ) )
+   hb_setenv( "HB_LIB_INSTALL", cRoot + "lib/" + GetEnv( "HB_PLATFORM" ) + "/" + GetEnv( "HB_COMPILER" ) + iif( lBuildName, "/" + GetEnv( "HB_BUILD_NAME" ), "" ) )
    hb_setenv( "HB_DYN_INSTALL" )
    hb_setenv( "HB_INC_INSTALL", cRoot + "include" )
 

harbour/utils/hbmk2/hbmk2.prg

@@ -3958,6 +3958,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                   SWITCH Eval( bBlk_ImpLib, cMakeImpLibDLL, tmp, ArrayToList( hbmk[ _HBMK_aOPTI ] ) )
                   CASE _HBMK_IMPLIB_OK
                      hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created import library: %1$s <= %2$s" ), tmp, cMakeImpLibDLL ) )
+                     AAddNewINST( hbmk[ _HBMK_aINSTFILE ], { "", tmp }, .T. )
                      EXIT
                   CASE _HBMK_IMPLIB_FAILED
                      hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Failed creating import library %1$s from %2$s." ), tmp, cMakeImpLibDLL ) )
@@ -3965,6 +3966,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                   ENDSWITCH
                ENDIF
             NEXT
+            IF ! hbmk[ _HBMK_lCLEAN ]
+               DoInstCopy( hbmk )
+            ENDIF
          ELSE
             IF hbmk[ _HBMK_lInfo ]
                hbmk_OutErr( hbmk, I_( "Warning: No import library source was specified" ) )
@@ -6908,10 +6912,14 @@ STATIC FUNCTION AAddNew( array, xItem )
 
    RETURN array
 
-STATIC FUNCTION AAddNewINST( array, xItem )
+STATIC FUNCTION AAddNewINST( array, xItem, lToTop )
 
    IF AScan( array, {| tmp | tmp[ 2 ] == xItem[ 2 ] } ) == 0
-      AAdd( array, xItem )
+      IF lToTop != NIL .AND. lToTop
+         hb_AIns( array, 1, xItem, .T. )
+      ELSE
+         AAdd( array, xItem )
+      ENDIF
    ENDIF
 
    RETURN array