diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e133ac17a9..33d1bb407e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-05-09 23:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+  * config/doc.cf
+  * config/header.cf
+    ! Fixes to deal with situation where installation
+      directories are left undefined to avoid installation.
+
 2003-05-09 20:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
   * config/doc.cf
     ! Removed an extra layer of "protection" that resulted in an
diff --git a/harbour/config/doc.cf b/harbour/config/doc.cf
index 386c44004e..eaf05ac19a 100644
--- a/harbour/config/doc.cf
+++ b/harbour/config/doc.cf
@@ -9,10 +9,14 @@ include $(TOP)$(ROOT)config/global.cf
 
 first::
 
+ifeq ($(HB_DOC_INSTALL),)
+install::
+
+else
 INSTALL_OBJS = $(DOC_FILES)
 INSTALL_DIR = $(HB_DOC_INSTALL)$(DOC_SUBDIR)
 
 include $(TOP)$(ROOT)config/install.cf
-
+endif
 endif
 endif
diff --git a/harbour/config/header.cf b/harbour/config/header.cf
index 408acdc85f..ee88b1735f 100644
--- a/harbour/config/header.cf
+++ b/harbour/config/header.cf
@@ -7,17 +7,18 @@ ifneq ($(HB_COMPILER),)
 
 include $(TOP)$(ROOT)config/global.cf
 
-#EXE_NAME = $(C_MAIN:.c=$(EXE_EXT))
-#EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
-
 ALL_HEADERS = $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
 
 first::
 
+ifeq ($(HB_INC_INSTALL),)
+install::
+
+else
 INSTALL_OBJS = $(ALL_HEADERS)
 INSTALL_DIR = $(HB_INC_INSTALL)
 
 include $(TOP)$(ROOT)config/install.cf
-
+endif
 endif
 endif