diff --git a/CHANGES b/CHANGES index 92be481..2529992 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,17 @@ The following are the changes from calc version 2.12.3.0 to date: Added MINGW32_NT-5.0 compile target based on a patch from Brian L. Angus (angus at eng dot utah dot edu). + Removed the use of rpm.release in the Makefile. + + Mac OS Darwin targets no longer attempt to use ldconfig. Under the + Darwin target, the LDCONFIG make variable is redefined to be + an empty value. Thanks goes to Ralf Trinler (art at infra dot de) + for reporting this problem. + + The ${CALC_INCDIR}/custom is no longer being removed at install time + if it is empty. Now when ${ALLOW_CUSTOM} make variable is empty, + an empty ${CALC_INCDIR}/custom may be left hehind. + The following are the changes from calc version 2.12.2.3 to 2.12.2.4: @@ -6720,8 +6731,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.14 $ -## @(#) $Id: CHANGES,v 30.14 2008/04/15 21:37:54 chongo Exp $ +## @(#) $Revision: 30.16 $ +## @(#) $Id: CHANGES,v 30.16 2008/05/09 20:30:04 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index baf237b..212ddcb 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.28 $$ -# @(#) $Id: Makefile.ship,v 30.28 2008/04/15 21:17:57 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.33 $$ +# @(#) $Id: Makefile.ship,v 30.33 2008/05/09 20:30:04 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -984,7 +984,7 @@ EXT= # The default calc versions # -VERSION= 2.12.3.1 +VERSION= 2.12.3.2 VERS= 2.12.3 VER= 2.12 VE= 2 @@ -1193,6 +1193,8 @@ LIB_EXT_VERSION:= .${VERSION}${LIB_EXT} LIB_EXT_VERS:= .${VERS}${LIB_EXT} LIB_EXT_VER:= .${VER}${LIB_EXT} LIB_EXT_VE:= .${VE}${LIB_EXT} +# LDCONFIG not required on this platform, so we redefine it to an empty string +LDCONFIG:= # DARWIN_ARCH= -arch i386 -arch ppc # Universal binary # DARWIN_ARCH= -arch i386 # Intel binary # DARWIN_ARCH= -arch ppc # PPC binary @@ -4002,12 +4004,11 @@ env: @echo 'target=${target}'; echo '' @echo '=-=-=-=-= ${MAKE_FILE} end of major make variable dump =-=-=-=-=' -mkdebug: env version.c rpm.release +mkdebug: env version.c @echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' @echo '=-=-=-=-= Determining the source version =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ ver_calc${EXT} -@./ver_calc${EXT} - -@./ver_calc${EXT} -r rpm.release @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ all @echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' @@ -4016,7 +4017,7 @@ mkdebug: env version.c rpm.release @echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' @echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' -debug: env rpm.release +debug: env @echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ clobber @@ -4024,7 +4025,6 @@ debug: env rpm.release @echo '=-=-=-=-= Determining the source version =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ ver_calc${EXT} -@./ver_calc${EXT} - -@./ver_calc${EXT} -r rpm.release @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ all @echo '=-=-=-=-= Determining the binary version =-=-=-=-=' @@ -4483,9 +4483,11 @@ endif ${T}${LIBDIR}/libcustcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ if [ -z "${T}" -o "/" = "${T}" ]; then \ - echo "running ${LDCONFIG}"; \ - ${LDCONFIG}; \ - echo "finished ${LDCONFIG}"; \ + if [ ! -z "${LDCONFIG}" ]; then \ + echo "running ${LDCONFIG}"; \ + ${LDCONFIG} -v; \ + echo "finished ${LDCONFIG}"; \ + fi; \ fi; \ fi -${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \ @@ -4558,8 +4560,6 @@ endif fi; \ fi; \ fi - ${V} # NOTE: remove ${T}${CALC_INCDIR}/custom if it is empty - -${Q} ${RMDIR} ${T}${CALC_INCDIR}/custom 2>/dev/null ${V} # NOTE: misc install cleanup ${Q} ${RM} -f tmp ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' @@ -4688,9 +4688,11 @@ uninstall: custom/Makefile fi; \ fi -${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \ - echo "running ${LDCONFIG}"; \ - ${LDCONFIG}; \ - echo "finished ${LDCONFIG}"; \ + if [ ! -z "${LDCONFIG}" ]; then \ + echo "running ${LDCONFIG}"; \ + ${LDCONFIG} -v; \ + echo "finished ${LDCONFIG}"; \ + fi; \ fi -${Q} if [ -f "${T}${LIBDIR}/libcalc.a" ]; then \ ${RM} -f "${T}${LIBDIR}/libcalc.a"; \ diff --git a/Makefile.simple b/Makefile.simple index cb05ad9..ae5f2b5 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.28 $$ -# @(#) $Id: Makefile.ship,v 30.28 2008/04/15 21:17:57 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.33 $$ +# @(#) $Id: Makefile.ship,v 30.33 2008/05/09 20:30:04 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -961,7 +961,7 @@ EXT= # The default calc versions # -VERSION= 2.12.3.1 +VERSION= 2.12.3.2 VERS= 2.12.3 VER= 2.12 VE= 2 @@ -3575,12 +3575,11 @@ env: @echo 'target=${target}'; echo '' @echo '=-=-=-=-= ${MAKE_FILE} end of major make variable dump =-=-=-=-=' -mkdebug: env version.c rpm.release +mkdebug: env version.c @echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' @echo '=-=-=-=-= Determining the source version =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ ver_calc${EXT} -@./ver_calc${EXT} - -@./ver_calc${EXT} -r rpm.release @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ all @echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' @@ -3589,7 +3588,7 @@ mkdebug: env version.c rpm.release @echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' @echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' -debug: env rpm.release +debug: env @echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ clobber @@ -3597,7 +3596,6 @@ debug: env rpm.release @echo '=-=-=-=-= Determining the source version =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ ver_calc${EXT} -@./ver_calc${EXT} - -@./ver_calc${EXT} -r rpm.release @echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-=' @${MAKE} -f Makefile Q= V=@ all @echo '=-=-=-=-= Determining the binary version =-=-=-=-=' @@ -4040,9 +4038,11 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all ${T}${LIBDIR}/libcustcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ if [ -z "${T}" -o "/" = "${T}" ]; then \ - echo "running ${LDCONFIG}"; \ - ${LDCONFIG}; \ - echo "finished ${LDCONFIG}"; \ + if [ ! -z "${LDCONFIG}" ]; then \ + echo "running ${LDCONFIG}"; \ + ${LDCONFIG} -v; \ + echo "finished ${LDCONFIG}"; \ + fi; \ fi; \ fi -${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \ @@ -4115,8 +4115,6 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all fi; \ fi; \ fi - ${V} # NOTE: remove ${T}${CALC_INCDIR}/custom if it is empty - -${Q} ${RMDIR} ${T}${CALC_INCDIR}/custom 2>/dev/null ${V} # NOTE: misc install cleanup ${Q} ${RM} -f tmp ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' @@ -4245,9 +4243,11 @@ uninstall: custom/Makefile fi; \ fi -${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \ - echo "running ${LDCONFIG}"; \ - ${LDCONFIG}; \ - echo "finished ${LDCONFIG}"; \ + if [ ! -z "${LDCONFIG}" ]; then \ + echo "running ${LDCONFIG}"; \ + ${LDCONFIG} -v; \ + echo "finished ${LDCONFIG}"; \ + fi; \ fi -${Q} if [ -f "${T}${LIBDIR}/libcalc.a" ]; then \ ${RM} -f "${T}${LIBDIR}/libcalc.a"; \ diff --git a/custom/Makefile b/custom/Makefile index a7179fd..cc42a75 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -582,6 +582,8 @@ LIB_EXT_VERSION:= .${VERSION}${LIB_EXT} LIB_EXT_VERS:= .${VERS}${LIB_EXT} LIB_EXT_VER:= .${VER}${LIB_EXT} LIB_EXT_VE:= .${VE}${LIB_EXT} +# LDCONFIG not required on this platform, so we redefine it to an empty string +LDCONFIG:= # DARWIN_ARCH= -arch i386 -arch ppc # Universal binary # DARWIN_ARCH= -arch i386 # Intel binary # DARWIN_ARCH= -arch ppc # PPC binary diff --git a/version.c b/version.c index 003070a..6672b7f 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.7 $ - * @(#) $Id: version.c,v 30.7 2008/04/15 21:37:54 chongo Exp $ + * @(#) $Revision: 30.8 $ + * @(#) $Id: version.c,v 30.8 2008/05/09 19:45:39 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -49,7 +49,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 3 /* major software level under library version */ -#define MINOR_PATCH 1 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 2 /* minor software level or 0 if not patched */ /*