From 9d6febd38eae427258bebdb80ef51906b363efe7 Mon Sep 17 00:00:00 2001 From: Raymond Toy <toy.raymond@gmail.com> Date: Wed, 25 Mar 2020 01:12:38 +0000 Subject: [PATCH] Fix #82: Replace bc with expr `expr` is more commonly installed than `bc` so reduce the number of required dependencies and just use `expr`. --- src/general-info/release-21e.md | 1 + src/lisp/GNUmakefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/general-info/release-21e.md b/src/general-info/release-21e.md index fdcda6c93..610eba11b 100644 --- a/src/general-info/release-21e.md +++ b/src/general-info/release-21e.md @@ -34,6 +34,7 @@ public domain. * ~~#79~~ Autoload ASDF when calling `REQUIRE` the first time. User's no longer have to explicitly load ASDF anymore. * ~~#80~~ Use ASDF to load contribs. cmu-contribs still exists but does nothing. The contrib names are the same, except it's best to use a keyword instead of a string. So, `:contrib-demos` instead of `"contrib-demos"`. * ~~#81~~ Added contribs from Eric Marsden + * ~~#82~~ Replace bc with expr in GNUMakefile * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index 4abc3d26b..40af98184 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -47,7 +47,7 @@ lisp.nm: lisp lisp.a mv ,lisp.nm lisp.nm version.o : version.c version - echo '1 + ' `cat version` | bc > ,version + expr 1 + `cat version` > ,version mv ,version version $(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $< -- GitLab