From 8e8d6c852ac1b7f85deeed6da03c58f2defe416c Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 19 Dec 2023 01:00:25 -0800 Subject: [PATCH] fix distlist inventory and fix make clobber --- Makefile | 2 +- help/Makefile | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5a4a44efb..e0417d51e 100644 --- a/Makefile +++ b/Makefile @@ -3438,7 +3438,7 @@ clobber: clean ${RM} -f *.u ${RM} -f libcalc.a ${RM} -f libcustcalc.a - ${RM} -f calc.1 calc.cat1 + ${RM} -f calc.1 calc.usage calc.cat1 ${RM} -f calc.pixie calc.rf calc.Counts calc.cord ${RM} -f gen_h Makefile.bak tmp.patch ${RM} -rf skel diff --git a/help/Makefile b/help/Makefile index 40f251793..731e5a8fc 100644 --- a/help/Makefile +++ b/help/Makefile @@ -118,7 +118,8 @@ V=@: # Files managed by this Makefile # ################################## -STD_HELP_FILES_1= intro overview calc +STD_HELP_FILES_1= intro overview +BLT_HELP_FILES_1a= calc STD_HELP_FILES_2= assoc BLT_HELP_FILES_3= builtin @@ -148,7 +149,8 @@ STD_HELP_FILES_17= help # These files are used in the following order to construct full # -FULL_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ +FULL_HELP_FILES= ${STD_HELP_FILES_1} ${BLT_HELP_FILES_1a} \ + ${STD_HELP_FILES_2} \ ${BLT_HELP_FILES_3} ${STD_HELP_FILES_4} \ ${BLT_HELP_FILES_5} ${STD_HELP_FILES_6} \ ${SPECIAL_HELP_7} ${STD_HELP_FILES_8} \ @@ -171,7 +173,8 @@ STD_HELP_FILES= ${STD_HELP_FILES_1} ${STD_HELP_FILES_2} \ # Note that ${SPECIAL_HELP_7} is not included in this list # because of problems with its name. # -BLT_HELP_FILES= ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \ +BLT_HELP_FILES= ${BLT_HELP_FILES_1a} \ + ${BLT_HELP_FILES_3} ${BLT_HELP_FILES_5} \ ${BLT_HELP_FILES_9} ${BLT_HELP_FILES_11} \ ${BLT_HELP_FILES_13} ${BLT_HELP_FILES_16}