From f88cc071fcbbf372d41bf0f5465e3a405804df9c Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Fri, 29 Aug 2014 16:33:11 -0700
Subject: [PATCH] configure, ioc/db: remove clutter left by rebase, add rule
 for pm to html generation (include pm in ..)

---
 configure/RULES.Db | 11 ++++++-----
 src/ioc/db/RULES   | 17 +++--------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index e1b981851..f95582e70 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -223,10 +223,6 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-	@$(RM) $@
-	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
-
 %.dbd$(DEP): %Include.dbd
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
@@ -352,7 +348,7 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 ##################################################### DBD files
 
-$(COMMON_DIR)/bpt%.dbd: bpt%.data 
+$(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -418,6 +414,11 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
+$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
 .PRECIOUS: $(COMMON_DIR)/%.html
 
 ##################################################### DB files
diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES
index 8c8c4d7b9..b89e2711c 100644
--- a/src/ioc/db/RULES
+++ b/src/ioc/db/RULES
@@ -11,23 +11,12 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-dbCommon.h$(DEP): ../db/dbCommonRecord.dbd ../db/RULES
+dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/RULES
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D -I ../db -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET):" >> $@
+	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-$(COMMON_DIR)/dbCommon.h: ../db/dbCommonRecord.dbd
+$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) -I ../db -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
-
-menuGlobal.dbd$(DEP): ../db/RULES
-	@$(RM) $@
-	@echo "$(COMMONDEP_TARGET):" > $@
-
-$(COMMON_DIR)/menuGlobal.dbd: ../db/Makefile
-	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/makeIncludeDbd.pl $(menuGlobal_DBD) $(notdir $@)
-	@$(MV) $(notdir $@) $@
-
-