diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7708d36f7f..137db18cba 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-17 13:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/pp/Makefile
+    * removed old  HB_PP_RULES used for precomputed pptables
+    * added protection against setting possible actions executed without
+      HB_ARCHITECTURE and HB_COMPILER
+
 2009-07-17 12:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/globsh.cf
     + Attempt to fix dos shell clean rules. Please test.
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index b20f261cde..98e835fbd9 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -19,6 +19,9 @@ LIBS=\
 
 include $(TOP)$(ROOT)config/lib.cf
 
+ifneq ($(HB_ARCHITECTURE),)
+ifneq ($(HB_COMPILER),)
+
 INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
 
 HB_VERHEADER=$(TOP)$(ROOT)include/hbverbld.h
@@ -26,13 +29,9 @@ HB_VERHEADER=$(TOP)$(ROOT)include/hbverbld.h
 EXE_FILE := $(EXE_DIR)/hbpp$(EXE_EXT)
 vpath hbpp$(EXE_EXT) $(EXE_DIR)
 
-ifneq ($(HB_PP_RULES),)
-pptable.c : $(HB_PP_RULES)
-	$(CP) $(subst /,$(DIRSEP),$<) $@
-else
 pptable.c : hbpp$(EXE_EXT)
 	$(HB_HOST_BIN_DIR)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER)
-endif
+
 
 ifneq ($(HB_BIN_INSTALL),)
 INSTALL_FILES = $(EXE_DIR)/hbpp$(EXE_EXT)
@@ -48,3 +47,6 @@ clean::
 	-@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER))
 	-@$(RM) $(subst /,$(DIRSEP),$(EXE_DIR)/hbpp$(EXE_EXT))
 	-@$(RM) $(subst /,$(DIRSEP),$(EXE_DIR)/hbpp.tds)
+
+endif
+endif