diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e0f8d6d58b..dc52393bce 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-06 17:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * renamed --hbbindir --hblibdir --hbincdir parameters to
+      --hbdirbin --hbdirlib --hbdirinc
+
 2009-04-06 17:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added --hbdirdyn.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 5b969d8ffc..2e9f6ff435 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -414,9 +414,9 @@ while [ \$n -lt \${#P[@]} ]; do
         -g[cohwij])  HB_GEN="\${v#-g}"; p="\${v}" ;;
         -gc[0-9])    HB_GEN="c"; p="\${v}" ;;
         -go[0-9])    HB_GEN="o"; p="\${v}" ;;
-        --hblibdir)  echo "\${HB_LIB_INSTALL}"; HB_EXIT="yes" ;;
-        --hbincdir)  echo "\${HB_INC_INSTALL}"; HB_EXIT="yes" ;;
-        --hbbindir)  echo "\${HB_BIN_INSTALL}"; HB_EXIT="yes" ;;
+        --hbdirlib)  echo "\${HB_LIB_INSTALL}"; HB_EXIT="yes" ;;
+        --hbdirinc)  echo "\${HB_INC_INSTALL}"; HB_EXIT="yes" ;;
+        --hbdirbin)  echo "\${HB_BIN_INSTALL}"; HB_EXIT="yes" ;;
         -*)          p="\${v}" ;;
         *)           [ -z \${FILEOUT} ] && FILEOUT="\${v##*/}"; p="\${v}" ;;
     esac
@@ -425,7 +425,8 @@ while [ \$n -lt \${#P[@]} ]; do
 done
 P=( "\${PP[@]}" )
 
-[ "\${HB_EXIT}" != "yes" ] || exit
+[ "\${P}" != "" ] && HB_EXIT="no"
+[ "\${HB_EXIT}" = "yes" ] && exit
 
 case "\${HB_MT}" in
     [Mm][Tt]|[Yy][Ee][Ss]|1)  HB_MT="MT";;