drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed how Makefile.simple is formed

Browse Source
This commit is contained in:
Landon Curt Noll
2021-03-26 23:27:46 -07:00
parent f5d5319a51
commit ca0aaa0c3a
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -29,6 +29,8 @@ The following are the changes from calc version 2.12.9.2 to date:
Fixed how calc man page in ${CATDIR} is formed.
Fixed how Makefile.simple is formed.
The following are the changes from calc version 2.12.8.2 to 2.12.9.1:

17
Makefile.ship
View File

@@ -4285,7 +4285,7 @@ Makefile.simple: ${MAKE_FILE} custom/Makefile.simple
${Q} ${RM} -f $@
${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
${MAKE_FILE} | \
${SED} -e 's;cd custom; $${MAKE} -f Makefile/&.simple;g' \
${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
-e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-e 's;via$$;via ${MAKE} -f ${MAKE_FILE} $@;' > $@
${Q} echo >> $@
@@ -4807,16 +4807,20 @@ clobber: clean custom/Makefile
${RM} -f a.out
${RM} -f all
${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-cd help; ${RM} -f all; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@
-${RM} -f help/all; \
cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
-cd cal; ${RM} -f all; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@
-${RM} -f cal/all; \
cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
cd custom; ${RM} -f all; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
-${RM} -f custom/all; \
cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
-${RM} -f cscript/all; \
cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
${V} echo remove files that are obsolete
${RM} -rf win32 build
@@ -5116,9 +5120,6 @@ endif
elif [ -x "${MANNAME}" ]; then \
echo "${MANMAKE} calc.1 ${T}${CATDIR}"; \
${MANMAKE} calc.1 ${T}${CATDIR}; \
else \
echo "Notice: no ${MROFF} and no ${MANMAKE}: this is OK" 1>&2; \
echo "Notice: skipping forming ${T}${MANDIR}/calc.${MANEXT}" 1>&2; \
fi; \
fi; \
fi