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

Fix how calc(1) cat page, if needed, is formed

Browse Source
This commit is contained in:
Landon Curt Noll
2021-03-26 22:30:19 -07:00
parent 3c866367c6
commit 263b8a78ef
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -27,6 +27,8 @@ The following are the changes from calc version 2.12.9.2 to date:
Fixed how the calc(1) man page is installed under macOS. Fixed how the calc(1) man page is installed under macOS.
Fixed how calc man page in ${CATDIR} is formed.
The following are the changes from calc version 2.12.8.2 to 2.12.9.1: The following are the changes from calc version 2.12.8.2 to 2.12.9.1:

11
Makefile
View File

@@ -103,16 +103,6 @@ endif
CCBAN= -UUNBAN CCBAN= -UUNBAN
#CCBAN= -DUNBAN #CCBAN= -DUNBAN
# where man section 1 pages are installed
#
#if 0 /* start of skip for non-Gnu makefiles */
ifeq ($(target),Darwin)
MANDIR= /usr/local/share/man/man1
else
MANDIR= /usr/share/man/man1
#if 0 /* start of skip for non-Gnu makefiles */
endif
# Determine of the GNU-readline facility will be used instead of the # Determine of the GNU-readline facility will be used instead of the
# built-in calc binding method. # built-in calc binding method.
# #
@@ -250,7 +240,6 @@ XVAR= \
EXT='${EXT}' \ EXT='${EXT}' \
H='${H}' \ H='${H}' \
MAKE_FILE='${MAKE_FILE}' \ MAKE_FILE='${MAKE_FILE}' \
MANDIR='${MANDIR}' \
NROFF='${NROFF}' \ NROFF='${NROFF}' \
Q='${Q}' \ Q='${Q}' \
READLINE_INCLUDE='${READLINE_INCLUDE}' \ READLINE_INCLUDE='${READLINE_INCLUDE}' \

16
Makefile.ship
View File

@@ -866,6 +866,9 @@ endif
# #
# Use CATDIR= to disable installation of the calc cat (formatted) page. # Use CATDIR= to disable installation of the calc cat (formatted) page.
# #
# NOTE: If CATDIR is non-empty, then one should have either the
# ${NROFF} executable and/or the ${MANMAKE} executable.
#
CATDIR= CATDIR=
#CATDIR= /usr/local/man/cat1 #CATDIR= /usr/local/man/cat1
#CATDIR= /usr/local/catman/cat1 #CATDIR= /usr/local/catman/cat1
@@ -4987,7 +4990,7 @@ endif
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
ifdef ALLOW_CUSTOM ifdef ALLOW_CUSTOM
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-=' ${V} echo 'XXX =-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install ${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
#if 0 /* start of skip for non-Gnu makefiles */ #if 0 /* start of skip for non-Gnu makefiles */
@@ -5102,10 +5105,7 @@ endif
if ${CMP} -s calc.1 ${T}${MANDIR}/calc.${MANEXT}; then \ if ${CMP} -s calc.1 ${T}${MANDIR}/calc.${MANEXT}; then \
${TRUE}; \ ${TRUE}; \
else \ else \
if [ -z "${NROFF}" ]; then \ if [ -n "${NROFF}" ]; then \
echo "${MANMAKE} calc.1 ${T}${CATDIR}"; \
${MANMAKE} calc.1 ${T}${CATDIR}; \
else \
${RM} -f ${T}${CATDIR}/calc.${CATEXT}.new; \ ${RM} -f ${T}${CATDIR}/calc.${CATEXT}.new; \
${NROFF} ${NROFF_ARG} calc.1 > \ ${NROFF} ${NROFF_ARG} calc.1 > \
${T}${CATDIR}/calc.${CATEXT}.new; \ ${T}${CATDIR}/calc.${CATEXT}.new; \
@@ -5113,6 +5113,12 @@ endif
${MV} -f ${T}${CATDIR}/calc.${CATEXT}.new \ ${MV} -f ${T}${CATDIR}/calc.${CATEXT}.new \
${T}${CATDIR}/calc.${CATEXT}; \ ${T}${CATDIR}/calc.${CATEXT}; \
echo "installed ${T}${CATDIR}/calc.${CATEXT}"; \ echo "installed ${T}${CATDIR}/calc.${CATEXT}"; \
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; \ fi; \
fi fi