From 336e13b668065c4ebd3028fb37c5608180c080e6 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 19 Aug 2009 09:06:21 +0000
Subject: [PATCH] 2009-08-19 11:05 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/Makefile   * harbour/config/dir.mk   *
 harbour/config/global.mk     * eliminated HB_*POSTINST* variables, now it's
 used only localy       in harbour/Makefile     * modified root Makefile
 detection

---
 harbour/ChangeLog        |  8 ++++++++
 harbour/Makefile         | 24 ++++++++++--------------
 harbour/config/dir.mk    |  5 -----
 harbour/config/global.mk |  9 ++++-----
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 712bf8db0f..2bc7887c65 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-19 11:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/Makefile
+  * harbour/config/dir.mk
+  * harbour/config/global.mk
+    * eliminated HB_*POSTINST* variables, now it's used only localy
+      in harbour/Makefile
+    * modified root Makefile detection
+
 2009-08-19 10:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/sqlite3/sqlite3.c
   * external/sqlite3/sqlite3.h
diff --git a/harbour/Makefile b/harbour/Makefile
index 9dfc44c632..2412f8486d 100644
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -27,21 +27,17 @@ DIRS := \
 
 endif
 
-ifeq ($(HB_POSTINST),)
-   ifneq ($(HB_ROOTPOSTINST),)
-      HB_POSTINST := $(HB_ROOTPOSTINST) $(HB_POSTINSTPARAM)
+include $(ROOT)config/dir.mk
+
+ifeq ($(HB_SHELL),sh)
+   HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh
+else
+   ifeq ($(HB_SHELL),os2)
+      HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd)
    else
-      # TOOPT: Use HB_SHELL variable
-      ifneq ($(SHLVL),)
-         HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh $(HB_POSTINSTPARAM)
-      else
-         ifneq ($(OS2_SHELL),)
-            HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd) $(HB_POSTINSTPARAM)
-         else
-            HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM)
-         endif
-      endif
+      HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat)
    endif
 endif
 
-include $(ROOT)config/dir.mk
+install::
+	+$(HB_POSTINST)
diff --git a/harbour/config/dir.mk b/harbour/config/dir.mk
index 3c08a02b8a..096320388f 100644
--- a/harbour/config/dir.mk
+++ b/harbour/config/dir.mk
@@ -76,10 +76,5 @@ $(DIRS_MK) ::
 
 endif
 
-ifneq ($(HB_POSTINST),)
-install::
-	+$(HB_POSTINST)
-endif
-
 endif
 endif
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index c3ea2eb86a..0cddf4dd05 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -199,7 +199,7 @@ ifeq ($(HB_INIT_DONE),)
          ifeq ($(findstring install,$(HB_MAKECMDGOALS)),)
             export HB_BUILD_PKG := no
          else
-            ifeq ($(HB_POSTINST),)
+            ifneq ($(ROOT),./)
                export HB_BUILD_PKG := no
             endif
          endif
@@ -232,9 +232,6 @@ ifeq ($(HB_INIT_DONE),)
       #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
       #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
       #   HB_GPM_MOUSE                -> HB_HAS_GPM
-      #   HB_POSTINST                 -> ?
-      #   HB_ROOTPOSTINST             -> ?
-      #   HB_POSTINSTPARAM            -> ?
       #   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
@@ -709,8 +706,10 @@ OBJ_DIR := obj/$(ARCH_COMP)
 BIN_DIR := $(TOP)$(ROOT)bin/$(ARCH_COMP)
 LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_COMP)
 # define PKG_DIR only if run from root Makefile
-ifneq ($(HB_POSTINST),)
+ifeq ($(ROOT),./)
    PKG_DIR := $(TOP)$(ROOT)pkg/$(ARCH_COMP)
+else
+   PKG_DIR :=
 endif
 
 # Assemble relative path from OBJ_DIR to source.