From fbae174bb7e442d275970e25bcb78027fbd17c6f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 16 Aug 2009 08:05:03 +0000
Subject: [PATCH] 2009-08-16 10:04 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * ChangeLog   * config/globsh.cf     + 'clean' now deletes
 pkg/<arch>/<comp> dir. This ensures that       package creation always starts
 with a fresh empty dir.       Resolves existing TOFIX (marked DONE).

---
 harbour/ChangeLog        | 11 +++++++++--
 harbour/config/globsh.cf |  8 +++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3aa40d6a9d..e90aa9d925 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-16 10:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+  * config/globsh.cf
+    + 'clean' now deletes pkg/<arch>/<comp> dir. This ensures that
+      package creation always starts with a fresh empty dir.
+      Resolves existing TOFIX (marked DONE).
+
 2009-08-16 09:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
     ! Fixed to process HB_BUILD_NAME when forming package install dir
@@ -597,7 +604,7 @@
   * contrib/hbssl/Makefile
     + Relying on central OpenSSL detection logic.
     ; TOFIX: For hbmk2 hbssl.hbc should be added explicitly to the
-             cmdline yet.
+             cmdline yet. [DONE]
 
   * config/instsh.cf
     * Suppressing install copy command for cleaner output.
@@ -740,7 +747,7 @@
       is very simple now.
     ; TOFIX: Whole removal of above dir should be solved to avoid
              leftover old files to be included in the release packages.
-             Ideas are welcome.
+             Ideas are welcome. [DONE]
     ; TODO: Integrate into postinst.bat. [DONE]
     ; TODO: Move .nsi file to a better place. [DONE]
 
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index 44a483fc4b..1db4cdab46 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -18,6 +18,7 @@ ifneq ($(HB_SHELL),sh)
 TOOL_DIR := $(subst /,\,$(TOP)$(ROOT)config/)
 
 # Have to use '=' operator here for rules to work
+PKG_DIR_OS = $(subst /,\,$(PKG_DIR))
 OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
@@ -41,7 +42,7 @@ dirbase::
 	@[ -z "$(BIN_FILE)" ] || [ -d "$(BIN_DIR)" ] || $(MDP) $(BIN_DIR)
 
 clean::
-	-@$(RDP) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE); \
+	-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE); \
 	if [ -n "$(LIB_FILE)" ]; then \
 	   $(RM) $(basename $(LIB_FILE)).bak; \
 	   [ "`echo $(LIB_DIR)/*`" != "$(LIB_DIR)/*" ] || $(RDP) $(LIB_DIR); \
@@ -74,6 +75,7 @@ dirbase::
 
 clean::
 	-@if exist "$(OBJ_DIR_OS)" $(RDP) "$(OBJ_DIR_OS)"
+	-@if exist "$(PKG_DIR_OS)" $(RDP) "$(PKG_DIR_OS)"
 	$(if $(LIB_FILE),-@if exist "$(LIB_FILE_OS)" $(RM) "$(LIB_FILE_OS)",)
 	$(if $(LIB_FILE),-@if exist "$(basename $(LIB_FILE_OS)).bak" $(RM) "$(basename $(LIB_FILE_OS)).bak",)
 	$(if $(LIB_FILE),-@if exist "$(LIB_DIR_OS)" if not exist "$(LIB_DIR_OS)\*" $(RDP) "$(LIB_DIR_OS)",)
@@ -98,7 +100,7 @@ dirbase::
 	$(if $(BIN_FILE),-@if not exist $(BIN_DIR_OS) $(MDP) $(BIN_DIR),)
 
 clean::
-	@$(RDP) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
+	@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
 	$(if $(LIB_FILE),-@if exist $(LIB_DIR_OS) $(RDP) $(LIB_DIR_OS),)
 	$(if $(BIN_FILE),-@if exist $(BIN_DIR_OS) $(RDP) $(BIN_DIR_OS),)
 
@@ -119,7 +121,7 @@ dirbase::
 	$(if $(BIN_FILE),-@if not exist $(BIN_DIR_OS)\nul $(MDP) $(BIN_DIR_OS),)
 
 clean::
-	-@$(RDP) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
+	-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
 	$(if $(LIB_FILE),-@if exist $(basename $(LIB_FILE_OS)).bak $(RM) $(basename $(LIB_FILE_OS)).bak,)
 	$(if $(LIB_FILE),-@if not exist $(LIB_DIR_OS)\*.* $(RDP) $(LIB_DIR_OS),)
 	$(if $(BIN_FILE),-@if exist $(basename $(BIN_FILE_OS)).tds $(RM) $(basename $(BIN_FILE_OS)).tds,)