Merge 3.15 branch into 7.0

Includes support for 'make inc'
2021-03-12 00:04:32 -06:00
parent f30e9533c4 0c4ab7b24a
commit e10b1d7660
9 changed files with 37 additions and 19 deletions
@@ -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

@@ -301,11 +301,11 @@ static void makeSubstitutions(inputData * const inputPvt,
            char *pstart;
            char *pend;
            int  cmdind=-1;
-            int  i;
+            size_t  i;

            for (i = 0; i < NELEMENTS(cmdNames); i++) {
                if (strstr(command, cmdNames[i])) {
-                    cmdind = i;
+                    cmdind = (int)i;
                }
            }
            if (cmdind < 0) goto endcmd;