From c359b49aedbbb2e91c1c5e6c38904ee1a3d7363f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Wed, 10 Mar 2021 22:05:39 -0600
Subject: [PATCH] Fix the 3.15 'make inc' build target

Now generates and installs dbd, header and html files.
No compilation involved/required.
---
 configure/RULES.Db    | 3 ++-
 configure/RULES_BUILD | 6 ++++--
 configure/RULES_TOP   | 2 +-
 src/ioc/bpt/Makefile  | 3 +++
 src/tools/Makefile    | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 8c5d99ed7..7cf50322b 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -187,7 +187,8 @@ endif
 
 #####################################################  build dependancies, clean rule
 
-inc : $(COMMON_INC) $(INSTALL_INC)
+inc : $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
 
 build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 3dcbcaa74..96603d26b 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -93,10 +93,12 @@ include $(CONFIG)/RULES_TARGET
 #---------------------------------------------------------------
 # Read dependency files
 
+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
 endif
+endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -144,14 +146,14 @@ build: inc
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
+inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) \
+	$(INSTALL_HTMLS)
 
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_DOCS) \
-	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
 
diff --git a/configure/RULES_TOP b/configure/RULES_TOP
index abcd75cb8..012d7f9ad 100644
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -45,7 +45,7 @@ help:
 	@echo "Usage: gnumake [options] [target] ..."
 	@echo "Targets supported by all Makefiles:"
 	@echo "     all            - Same as install (default rule)"
-	@echo "     inc            - Installs header files"
+	@echo "     inc            - Installs header, dbd and html files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
 	@echo "     buildInstall   - Same as install (deprecated)"
diff --git a/src/ioc/bpt/Makefile b/src/ioc/bpt/Makefile
index b8d73345f..d6367bfe3 100644
--- a/src/ioc/bpt/Makefile
+++ b/src/ioc/bpt/Makefile
@@ -19,7 +19,10 @@ BPT_DBD += bptTypeJdegC.dbd
 BPT_DBD += bptTypeJdegF.dbd
 BPT_DBD += bptTypeKdegC.dbd
 BPT_DBD += bptTypeKdegF.dbd
+
+ifneq (inc,$(strip $(MAKECMDGOALS)))
 DBD += $(BPT_DBD)
+endif
 
 PROD_HOST += makeBpt
 
diff --git a/src/tools/Makefile b/src/tools/Makefile
index faa08abbf..1d9991d2b 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -86,6 +86,8 @@ CLEANS += epics-base-$(T_A).pc@
 
 include $(TOP)/configure/RULES
 
+inc: $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)
+
 epics-base-$(T_A).pc@: ../epics-base-arch.pc@
 	@$(RM) $@
 	@$(CP) $< $@