From af57104e25c55dc80155a030760760dc8a194736 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Dec 2021 03:01:46 -0800 Subject: [PATCH] Fixed depend rule for custom/Makefile --- CHANGES | 2 ++ Makefile.ship | 2 ++ custom/Makefile | 2 ++ custom/Makefile.head | 1 + custom/Makefile.tail | 1 + 5 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index 3869b8b..19de1b6 100644 --- a/CHANGES +++ b/CHANGES @@ -23,6 +23,8 @@ The following are the changes from calc version 2.14.0.11 to date: generator. We have been using the subtractive 100 in place of the additive 55 generator for a while now. + Fixed depend rule for custom/Makefile. + The following are the changes from calc version 2.14.0.9 to 2.14.0.10: diff --git a/Makefile.ship b/Makefile.ship index bd2ec4a..da7fff6 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1267,6 +1267,7 @@ SPLINT= splint SPLINT_OPTS= STRIP= strip TEE= tee +TAIL= tail TOUCH= touch TRUE= true UNAME= uname @@ -2080,6 +2081,7 @@ CUSTOM_PASSDOWN= \ SHELL=${SHELL} \ SORT=${SORT} \ T=${T} \ + TAIL=${TAIL} \ TOP_MAKE_FILE=${MAKE_FILE} \ TOUCH=${TOUCH} \ TRUE=${TRUE} \ diff --git a/custom/Makefile b/custom/Makefile index 15ed4c7..4d6cfd7 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -522,6 +522,7 @@ RM= rm RMDIR= rmdir SED= sed SORT= sort +TAIL= tail TOUCH= touch TRUE= true @@ -1355,6 +1356,7 @@ depend: ${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \ ${MAKE_FILE}.bak > ${MAKE_FILE} ${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE} + ${Q} ${TAIL} -4 ${MAKE_FILE}.tail >> ${MAKE_FILE} ${Q} echo removing skel ${Q} ${RM} -rf skel -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \ diff --git a/custom/Makefile.head b/custom/Makefile.head index fc69672..063acde 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -522,6 +522,7 @@ RM= rm RMDIR= rmdir SED= sed SORT= sort +TAIL= tail TOUCH= touch TRUE= true diff --git a/custom/Makefile.tail b/custom/Makefile.tail index 4f9b4e2..a6163f6 100644 --- a/custom/Makefile.tail +++ b/custom/Makefile.tail @@ -246,6 +246,7 @@ depend: ${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' \ ${MAKE_FILE}.bak > ${MAKE_FILE} ${Q} ${GREP} -v '^#' skel/custom/makedep.out >> ${MAKE_FILE} + ${Q} ${TAIL} -4 ${MAKE_FILE}.tail >> ${MAKE_FILE} ${Q} echo removing skel ${Q} ${RM} -rf skel -${Q} if ${CMP} -s ${MAKE_FILE}.bak ${MAKE_FILE}; then \