From fdb2ad7892933aea1eedd5b199432b988a7df972 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Tue, 2 Mar 2021 14:07:52 -0500 Subject: [PATCH] Chez Scheme: avoid hard-coded paths for utilities in build scripts These changes facilitate building Chez Scheme in environments where utility commands are not available at their usual absolute paths, such as Nix and GNU Guix. Specific changes: - `cc` -> `$(CC)` - `/bin/rm` -> `rm` - `/bin/ln` -> `ln` - `/bin/cp` -> `cp` - `/bin/echo` -> `echo` - in `makefiles/installsh`, add a case to find `true` at an unusual path or as a shell builtin Related to https://github.com/racket/racket/issues/3707 --- racket/src/ChezScheme/LOG | 11 ++++++++++ racket/src/ChezScheme/csug/gifs/Makefile | 8 +++---- racket/src/ChezScheme/csug/math/Makefile | 4 ++-- racket/src/ChezScheme/examples/Makefile | 2 +- .../src/ChezScheme/makefiles/Makefile-csug.in | 6 ++--- .../makefiles/Makefile-release_notes.in | 2 +- racket/src/ChezScheme/makefiles/Mf-install.in | 4 ++-- racket/src/ChezScheme/makefiles/installsh | 3 ++- racket/src/ChezScheme/mats/6.ms | 2 +- racket/src/ChezScheme/mats/Mf-a6fb | 4 ++-- racket/src/ChezScheme/mats/Mf-a6le | 4 ++-- racket/src/ChezScheme/mats/Mf-a6nb | 4 ++-- racket/src/ChezScheme/mats/Mf-a6ob | 4 ++-- racket/src/ChezScheme/mats/Mf-a6osx | 4 ++-- racket/src/ChezScheme/mats/Mf-arm32le | 4 ++-- racket/src/ChezScheme/mats/Mf-arm64le | 4 ++-- racket/src/ChezScheme/mats/Mf-arm64osx | 4 ++-- racket/src/ChezScheme/mats/Mf-i3fb | 4 ++-- racket/src/ChezScheme/mats/Mf-i3le | 4 ++-- racket/src/ChezScheme/mats/Mf-i3nb | 4 ++-- racket/src/ChezScheme/mats/Mf-i3ob | 4 ++-- racket/src/ChezScheme/mats/Mf-i3osx | 4 ++-- racket/src/ChezScheme/mats/Mf-i3qnx | 4 ++-- racket/src/ChezScheme/mats/Mf-ppc32le | 4 ++-- racket/src/ChezScheme/mats/Mf-ppc32osx | 4 ++-- racket/src/ChezScheme/mats/unix.ms | 4 ++-- racket/src/ChezScheme/newrelease | 22 +++++++++---------- racket/src/ChezScheme/pkg/Makefile | 2 +- .../ChezScheme/release_notes/gifs/Makefile | 6 ++--- .../ChezScheme/release_notes/math/Makefile | 4 ++-- racket/src/ChezScheme/s/Mf-base | 2 +- racket/src/ChezScheme/stex/Makefile | 6 ++--- racket/src/ChezScheme/stex/Mf-stex | 10 ++++----- racket/src/ChezScheme/stex/gifs/Makefile | 4 ++-- racket/src/ChezScheme/stex/math/Makefile | 4 ++-- racket/src/ChezScheme/workarea | 10 ++++----- .../ChezScheme/zlib/contrib/minizip/Makefile | 2 +- 37 files changed, 97 insertions(+), 85 deletions(-) diff --git a/racket/src/ChezScheme/LOG b/racket/src/ChezScheme/LOG index b6bf944d96..774b056e31 100644 --- a/racket/src/ChezScheme/LOG +++ b/racket/src/ChezScheme/LOG @@ -2179,3 +2179,14 @@ wininstall/ta6nt.wxs wininstall/ti3nt.wxs - newrelease no longer logs as updated files with no actual changes newrelease +- avoid hard-coded paths for utilities in build scripts + csug/gifs/Makefile csug/math/Makefile examples/Makefile + makefiles/Makefile-csug.in makefiles/Makefile-release_notes.in + makefiles/Mf-install.in makefiles/installsh mats/6.ms mats/Mf-a6fb + mats/Mf-a6le mats/Mf-a6nb mats/Mf-a6ob mats/Mf-a6osx mats/Mf-arm32le + mats/Mf-arm64le mats/Mf-arm64osx mats/Mf-i3fb mats/Mf-i3le mats/Mf-i3nb + mats/Mf-i3ob mats/Mf-i3osx mats/Mf-i3qnx mats/Mf-ppc32le mats/Mf-ppc32osx + mats/unix.ms newrelease pkg/Makefile release_notes/gifs/Makefile + release_notes/math/Makefile s/Mf-base stex/Makefile stex/Mf-stex + stex/gifs/Makefile stex/math/Makefile workarea + zlib/contrib/minizip/Makefile diff --git a/racket/src/ChezScheme/csug/gifs/Makefile b/racket/src/ChezScheme/csug/gifs/Makefile index 8676e4c0f6..4253ffd112 100644 --- a/racket/src/ChezScheme/csug/gifs/Makefile +++ b/racket/src/ChezScheme/csug/gifs/Makefile @@ -18,7 +18,7 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log *.aux + rm -f $*.dvi $*.log *.aux test -f $*.gif && chmod 644 $*.gif # translate ps file to gif w/o transparent white background @@ -28,7 +28,7 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif > $*.gif - /bin/rm -f $*.dvi $*.log *.aux + rm -f $*.dvi $*.log *.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} @@ -57,7 +57,7 @@ ghostRightarrow.gif: Rightarrow.tex giftrans -g '#000000=#ffffff' |\ giftopnm |\ ppmtogif -transparent white > $*.gif - /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux test -f $*.gif && chmod 644 $*.gif -clean: ; /bin/rm -f *.gif Make.out +clean: ; rm -f *.gif Make.out diff --git a/racket/src/ChezScheme/csug/math/Makefile b/racket/src/ChezScheme/csug/math/Makefile index 3385fdb546..3392ea87f7 100644 --- a/racket/src/ChezScheme/csug/math/Makefile +++ b/racket/src/ChezScheme/csug/math/Makefile @@ -15,11 +15,11 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log $*.aux + rm -f $*.dvi $*.log $*.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} ${gifs}: mathmacros -clean: ; /bin/rm -f *.gif Make.out +clean: ; rm -f *.gif Make.out diff --git a/racket/src/ChezScheme/examples/Makefile b/racket/src/ChezScheme/examples/Makefile index b1b4e1d1d5..3edfdd05cb 100644 --- a/racket/src/ChezScheme/examples/Makefile +++ b/racket/src/ChezScheme/examples/Makefile @@ -25,4 +25,4 @@ needed: ${obj} all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme} -clean: ; /bin/rm -f $(obj) expr.md +clean: ; rm -f $(obj) expr.md diff --git a/racket/src/ChezScheme/makefiles/Makefile-csug.in b/racket/src/ChezScheme/makefiles/Makefile-csug.in index 19282c55fb..0a5dbfe85b 100644 --- a/racket/src/ChezScheme/makefiles/Makefile-csug.in +++ b/racket/src/ChezScheme/makefiles/Makefile-csug.in @@ -30,7 +30,7 @@ install: target # thrice is not enough when starting from scratch logcheck1: $(x).thirdrun @if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\ - /bin/rm -f $(x).thirdrun ;\ + rm -f $(x).thirdrun ;\ $(MAKE) $(x).thirdrun;\ fi @@ -82,7 +82,7 @@ endif $(texsrc): $(moresrc) $(srcdir)/title.tex $(srcdir)/contents.tex $(srcdir)/bibliography.tex: - /bin/rm -f $*.tex + rm -f $*.tex echo "%%% DO NOT EDIT THIS FILE" > $*.tex echo "%%% Edit the .stex version instead" >> $*.tex echo "" >> $*.tex @@ -174,7 +174,7 @@ code: $(stexsrc) echo '(load "code" pretty-print)' | $(Scheme) -q $(x).clean: - -/bin/rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ + -rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ $(x).prethirdrun $(x).ans\ $(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\ tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\ diff --git a/racket/src/ChezScheme/makefiles/Makefile-release_notes.in b/racket/src/ChezScheme/makefiles/Makefile-release_notes.in index 4435b6fb29..64348a43c3 100644 --- a/racket/src/ChezScheme/makefiles/Makefile-release_notes.in +++ b/racket/src/ChezScheme/makefiles/Makefile-release_notes.in @@ -38,7 +38,7 @@ install: $x.pdf $x.html $(INSTALL) -m 2755 -d $(installdir)/gifs $(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs $(INSTALL) -m 2755 -d $(installdir)/math - -/bin/rm -rf $(installdir)/$(mathdir) + -rm -rf $(installdir)/$(mathdir) $(INSTALL) -m 2755 -d $(installdir)/$(mathdir) if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi diff --git a/racket/src/ChezScheme/makefiles/Mf-install.in b/racket/src/ChezScheme/makefiles/Mf-install.in index 1e59ed658f..bdaa0578df 100644 --- a/racket/src/ChezScheme/makefiles/Mf-install.in +++ b/racket/src/ChezScheme/makefiles/Mf-install.in @@ -114,12 +114,12 @@ bininstall: ${Bin} libbininstall: ${LibBin} $I -m 444 ${PetiteBoot} ${LibBin}/petite.boot if [ "${InstallPetiteName}" != "petite" ]; then\ - /bin/rm -f ${LibBin}/${InstallPetiteName}.boot;\ + rm -f ${LibBin}/${InstallPetiteName}.boot;\ ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\ fi $I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\ if [ "${InstallSchemeName}" != "scheme" ]; then\ - /bin/rm -f ${LibBin}/${InstallSchemeName}.boot;\ + rm -f ${LibBin}/${InstallSchemeName}.boot;\ ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\ fi ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot; diff --git a/racket/src/ChezScheme/makefiles/installsh b/racket/src/ChezScheme/makefiles/installsh index 48f1e4673f..95d85fb47d 100755 --- a/racket/src/ChezScheme/makefiles/installsh +++ b/racket/src/ChezScheme/makefiles/installsh @@ -1,7 +1,8 @@ #! /bin/sh if [ -x /bin/true ]; then TRUE=/bin/true; elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true; -else echo "Can't find /bin/true or /usr/bin/true" ; exit 1; +elif command -v true &> /dev/null; then TRUE=true; +else echo "Can't find /bin/true or /usr/bin/true and no true command" ; exit 1; fi while ${TRUE} ; do diff --git a/racket/src/ChezScheme/mats/6.ms b/racket/src/ChezScheme/mats/6.ms index 3fcf385e99..3909d2bd9b 100644 --- a/racket/src/ChezScheme/mats/6.ms +++ b/racket/src/ChezScheme/mats/6.ms @@ -2756,7 +2756,7 @@ (begin (system "ln -s ../examples .") (load "examples/fatfib.ss" compile) - (system "/bin/rm examples") + (system "rm examples") #t)) (or (windows?) (embedded?) (equal? diff --git a/racket/src/ChezScheme/mats/Mf-a6fb b/racket/src/ChezScheme/mats/Mf-a6fb index 8876bcf9c5..dff6a82788 100644 --- a/racket/src/ChezScheme/mats/Mf-a6fb +++ b/racket/src/ChezScheme/mats/Mf-a6fb @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6le b/racket/src/ChezScheme/mats/Mf-a6le index 77515234fe..0aab2af6d5 100644 --- a/racket/src/ChezScheme/mats/Mf-a6le +++ b/racket/src/ChezScheme/mats/Mf-a6le @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m64 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -m64 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6nb b/racket/src/ChezScheme/mats/Mf-a6nb index 4f15762dff..bd190d3d04 100644 --- a/racket/src/ChezScheme/mats/Mf-a6nb +++ b/racket/src/ChezScheme/mats/Mf-a6nb @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6ob b/racket/src/ChezScheme/mats/Mf-a6ob index 01c2b5b27c..beaa7ecbed 100644 --- a/racket/src/ChezScheme/mats/Mf-a6ob +++ b/racket/src/ChezScheme/mats/Mf-a6ob @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-a6osx b/racket/src/ChezScheme/mats/Mf-a6osx index bdbe8e6d5c..9d3ffcfc49 100644 --- a/racket/src/ChezScheme/mats/Mf-a6osx +++ b/racket/src/ChezScheme/mats/Mf-a6osx @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-arm32le b/racket/src/ChezScheme/mats/Mf-arm32le index da910c7e40..fd1a266dcf 100644 --- a/racket/src/ChezScheme/mats/Mf-arm32le +++ b/racket/src/ChezScheme/mats/Mf-arm32le @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-arm64le b/racket/src/ChezScheme/mats/Mf-arm64le index d2771a467d..d2015651d4 100644 --- a/racket/src/ChezScheme/mats/Mf-arm64le +++ b/racket/src/ChezScheme/mats/Mf-arm64le @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-arm64osx b/racket/src/ChezScheme/mats/Mf-arm64osx index b1d870ab48..fa66a57fd5 100644 --- a/racket/src/ChezScheme/mats/Mf-arm64osx +++ b/racket/src/ChezScheme/mats/Mf-arm64osx @@ -8,7 +8,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3fb b/racket/src/ChezScheme/mats/Mf-i3fb index 2a29b2a9a6..d0e8d4b4d0 100644 --- a/racket/src/ChezScheme/mats/Mf-i3fb +++ b/racket/src/ChezScheme/mats/Mf-i3fb @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3le b/racket/src/ChezScheme/mats/Mf-i3le index 8bee4684fb..2c8f84fc7e 100644 --- a/racket/src/ChezScheme/mats/Mf-i3le +++ b/racket/src/ChezScheme/mats/Mf-i3le @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3nb b/racket/src/ChezScheme/mats/Mf-i3nb index dcd50948ee..5080893085 100644 --- a/racket/src/ChezScheme/mats/Mf-i3nb +++ b/racket/src/ChezScheme/mats/Mf-i3nb @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3ob b/racket/src/ChezScheme/mats/Mf-i3ob index cbabe3fe16..47ad151462 100644 --- a/racket/src/ChezScheme/mats/Mf-i3ob +++ b/racket/src/ChezScheme/mats/Mf-i3ob @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3osx b/racket/src/ChezScheme/mats/Mf-i3osx index a2c67a2b04..e5bb87c2d6 100644 --- a/racket/src/ChezScheme/mats/Mf-i3osx +++ b/racket/src/ChezScheme/mats/Mf-i3osx @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-i3qnx b/racket/src/ChezScheme/mats/Mf-i3qnx index 724f2dbb84..3e1437a9a2 100644 --- a/racket/src/ChezScheme/mats/Mf-i3qnx +++ b/racket/src/ChezScheme/mats/Mf-i3qnx @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-ppc32le b/racket/src/ChezScheme/mats/Mf-ppc32le index 1e8703a751..204a6a7666 100644 --- a/racket/src/ChezScheme/mats/Mf-ppc32le +++ b/racket/src/ChezScheme/mats/Mf-ppc32le @@ -21,7 +21,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} + $(CC) -m32 -fPIC ${threadFlags} -shared -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/Mf-ppc32osx b/racket/src/ChezScheme/mats/Mf-ppc32osx index 21599d86b5..1fd2d8a909 100644 --- a/racket/src/ChezScheme/mats/Mf-ppc32osx +++ b/racket/src/ChezScheme/mats/Mf-ppc32osx @@ -8,7 +8,7 @@ fobj = foreign1.so include Mf-base foreign1.so: ${fsrc} ../boot/$m/scheme.h - cc -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + $(CC) -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} cat_flush: cat_flush.c - cc -o cat_flush cat_flush.c + $(CC) -o cat_flush cat_flush.c diff --git a/racket/src/ChezScheme/mats/unix.ms b/racket/src/ChezScheme/mats/unix.ms index cfba3e727b..23169895ef 100644 --- a/racket/src/ChezScheme/mats/unix.ms +++ b/racket/src/ChezScheme/mats/unix.ms @@ -72,8 +72,8 @@ (mat system (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void)) (begin - (system (format "~:[~;/pkg~]/bin/rm testfile.ss" (embedded?))) - (system (format "~:[~;/pkg~]/bin/echo hello > testfile.ss" (embedded?))) + (system (format "~:[~;/pkg~]rm testfile.ss" (embedded?))) + (system (format "~:[~;/pkg~]echo hello > testfile.ss" (embedded?))) (let ([p (open-input-file "testfile.ss")]) (and (eq? (read p) 'hello) (begin (close-input-port p) #t)))) diff --git a/racket/src/ChezScheme/newrelease b/racket/src/ChezScheme/newrelease index 80a53f3cdb..8005f1eeda 100755 --- a/racket/src/ChezScheme/newrelease +++ b/racket/src/ChezScheme/newrelease @@ -75,13 +75,13 @@ if ($status != 0) exit 1 cd $W -/bin/rm -f BUILDING +rm -f BUILDING sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ ../BUILDING > BUILDING set maybeupdatedfiles = ($maybeupdatedfiles BUILDING) -/bin/rm -f NOTICE +rm -f NOTICE sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ ../NOTICE > NOTICE @@ -92,19 +92,19 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in set maybeupdatedfiles = ($maybeupdatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in) -/bin/rm scheme.1.in +rm scheme.1.in sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \ -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \ ../scheme.1.in > scheme.1.in set maybeupdatedfiles = ($maybeupdatedfiles scheme.1.in) -/bin/rm -f c/Makefile.{,t}{i3,a6}nt +rm -f c/Makefile.{,t}{i3,a6}nt foreach fn (c/Makefile.{,t}{a6,i3}nt) set maybeupdatedfiles = ($maybeupdatedfiles $fn) sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn end -/bin/rm -f mats/Mf-{,t}{i3,a6}nt +rm -f mats/Mf-{,t}{i3,a6}nt foreach fn (mats/Mf-{,t}{a6,i3}nt) set maybeupdatedfiles = ($maybeupdatedfiles $fn) sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn @@ -123,11 +123,11 @@ sed -e "s/FILEVERSION .*/FILEVERSION $RCVERSION/"\ -e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc set maybeupdatedfiles = ($maybeupdatedfiles c/scheme.rc) -/bin/rm -f s/7.ss +rm -f s/7.ss sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss set maybeupdatedfiles = ($maybeupdatedfiles s/7.ss) -/bin/rm -f s/cmacros.ss +rm -f s/cmacros.ss set VNUM = `printf "%04x%02x%02x" $MR $mR $bR` sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss set maybeupdatedfiles = ($maybeupdatedfiles s/cmacros.ss) @@ -145,17 +145,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*
/Revised\1for Chez Schem ../csug/csug.stex > csug/csug.stex set maybeupdatedfiles = ($maybeupdatedfiles csug/copyright.stex csug/csug.stex) -/bin/rm bintar/Makefile +rm bintar/Makefile sed -e "s/^version = .*/version = $R/" \ -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \ ../bintar/Makefile > bintar/Makefile set maybeupdatedfiles = ($maybeupdatedfiles bintar/Makefile) -/bin/rm rpm/Makefile +rm rpm/Makefile sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile set maybeupdatedfiles = ($maybeupdatedfiles rpm/Makefile) -/bin/rm pkg/Makefile +rm pkg/Makefile sed -e "s/^version = .*/version = $R/" \ -e "s/© .* Cisco Systems/\© `date +%Y` Cisco Systems/" \ ../pkg/Makefile > pkg/Makefile @@ -174,7 +174,7 @@ foreach x ($maybeupdatedfiles) cmp -s ../$x $x || set updatedfiles = ($updatedfiles $x) end -/bin/rm LOG +rm LOG cat ../LOG > LOG echo "" >> LOG echo "$R changes:" >> LOG diff --git a/racket/src/ChezScheme/pkg/Makefile b/racket/src/ChezScheme/pkg/Makefile index 02652a2a51..b776d24a48 100644 --- a/racket/src/ChezScheme/pkg/Makefile +++ b/racket/src/ChezScheme/pkg/Makefile @@ -39,7 +39,7 @@ $(PKG): $(BUILDROOT)/$(PKG) --package-path $(BUILDROOT)\ $(PKG) sudo chown $(DOTUSER):$(DOTGROUP) $(PKG) - sudo /bin/rm -rf $(RELEASE) $(BUILDROOT) + sudo rm -rf $(RELEASE) $(BUILDROOT) $(BUILDROOT)/$(PKG): $(PKGCONTENT) sudo /usr/bin/pkgbuild\ diff --git a/racket/src/ChezScheme/release_notes/gifs/Makefile b/racket/src/ChezScheme/release_notes/gifs/Makefile index 95729659bf..701d53a178 100644 --- a/racket/src/ChezScheme/release_notes/gifs/Makefile +++ b/racket/src/ChezScheme/release_notes/gifs/Makefile @@ -15,7 +15,7 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log *.aux + rm -f $*.dvi $*.log *.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} @@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex giftrans -g '#000000=#ffffff' |\ giftopnm |\ ppmtogif -transparent white > $*.gif - /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux test -f $*.gif && chmod 644 $*.gif -clean: ; /bin/rm -f *.gif Make.out +clean: ; rm -f *.gif Make.out diff --git a/racket/src/ChezScheme/release_notes/math/Makefile b/racket/src/ChezScheme/release_notes/math/Makefile index b3ffae3b54..9eca430132 100644 --- a/racket/src/ChezScheme/release_notes/math/Makefile +++ b/racket/src/ChezScheme/release_notes/math/Makefile @@ -16,11 +16,11 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log $*.aux + rm -f $*.dvi $*.log $*.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} ${gifs}: mathmacros -clean: ; /bin/rm -f *.gif Make.out +clean: ; rm -f *.gif Make.out diff --git a/racket/src/ChezScheme/s/Mf-base b/racket/src/ChezScheme/s/Mf-base index f19d3d80d5..6239802f1c 100644 --- a/racket/src/ChezScheme/s/Mf-base +++ b/racket/src/ChezScheme/s/Mf-base @@ -214,7 +214,7 @@ profiled: $(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot $(MAKE) prettyclean $(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot" - /bin/rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot + rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot $(MAKE) prettyclean $(MAKE) all loadspd=t loadbpd=t diff --git a/racket/src/ChezScheme/stex/Makefile b/racket/src/ChezScheme/stex/Makefile index fa77487ab4..ed3131d813 100644 --- a/racket/src/ChezScheme/stex/Makefile +++ b/racket/src/ChezScheme/stex/Makefile @@ -49,10 +49,10 @@ install: $(exec) (umask 022; sed -e 's;include ~/stex/Mf-stex;include $(LIB)/Mf-stex;' Makefile.template > $(LIB)/Makefile.template) uninstall: - /bin/rm -rf $(LIB) + rm -rf $(LIB) clean: - /bin/rm -f Make.out + rm -f Make.out distclean: clean - /bin/rm -rf $m + rm -rf $m diff --git a/racket/src/ChezScheme/stex/Mf-stex b/racket/src/ChezScheme/stex/Mf-stex index e6cd3822e4..950b417b32 100644 --- a/racket/src/ChezScheme/stex/Mf-stex +++ b/racket/src/ChezScheme/stex/Mf-stex @@ -139,12 +139,12 @@ $(x).spell: $(x).bbl $(x).tex latexspell $(x).tex clean: $(x).clean - -/bin/rm -f *.log *.dvi *.aux *.out *.toc *.tmp *.idx *.ilg *.ind *.blg *.bbl *.rfm *.sfm *.firstrun *.secondrun *.thirdrun - -/bin/rm -f *.haux *.htoc *.hidx *.hfirstrun *.hsecondrun *.hthirdrun *.mathrun - -/bin/rm -f *.tex + -rm -f *.log *.dvi *.aux *.out *.toc *.tmp *.idx *.ilg *.ind *.blg *.bbl *.rfm *.sfm *.firstrun *.secondrun *.thirdrun + -rm -f *.haux *.htoc *.hidx *.hfirstrun *.hsecondrun *.hthirdrun *.mathrun + -rm -f *.tex reallyclean: clean $(x).reallyclean - -/bin/rm -f *.html *.ps *.pdf *.png + -rm -f *.html *.ps *.pdf *.png reallyreallyclean: reallyclean $(x).reallyreallyclean - -/bin/rm -rf $(mathdir) + -rm -rf $(mathdir) diff --git a/racket/src/ChezScheme/stex/gifs/Makefile b/racket/src/ChezScheme/stex/gifs/Makefile index 4a9abdb547..93c6457597 100644 --- a/racket/src/ChezScheme/stex/gifs/Makefile +++ b/racket/src/ChezScheme/stex/gifs/Makefile @@ -15,7 +15,7 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log *.aux + rm -f $*.dvi $*.log *.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} @@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex giftrans -g '#000000=#ffffff' |\ giftopnm |\ ppmtogif -transparent white > $*.gif - /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux test -f $*.gif && chmod 644 $*.gif clean: diff --git a/racket/src/ChezScheme/stex/math/Makefile b/racket/src/ChezScheme/stex/math/Makefile index b3ffae3b54..9eca430132 100644 --- a/racket/src/ChezScheme/stex/math/Makefile +++ b/racket/src/ChezScheme/stex/math/Makefile @@ -16,11 +16,11 @@ density=-r90x90 ${density} - |\ pnmcrop |\ ppmtogif -transparent white > $*.gif - /bin/rm -f $*.dvi $*.log $*.aux + rm -f $*.dvi $*.log $*.aux test -f $*.gif && chmod 644 $*.gif all: ${gifs} ${gifs}: mathmacros -clean: ; /bin/rm -f *.gif Make.out +clean: ; rm -f *.gif Make.out diff --git a/racket/src/ChezScheme/workarea b/racket/src/ChezScheme/workarea index 4c8abeb5c3..0f672e820b 100755 --- a/racket/src/ChezScheme/workarea +++ b/racket/src/ChezScheme/workarea @@ -130,9 +130,9 @@ esac if [ "$OS" = "Windows_NT" ] then - ln="/bin/cp -R" + ln="cp -R" else - ln="/bin/ln -s" + ln="ln -s" fi # This shell script creates a workarea for local modifications to the @@ -183,7 +183,7 @@ workln() forceworkln() { if [ ! -e $2 ] ; then - /bin/ln -s "$1" $2 2> /dev/null + ln -s "$1" $2 2> /dev/null fi } @@ -278,13 +278,13 @@ linkeach unicode # deep copy submodules where builds occur so changes don't propagate through symlinks for dir in `echo zlib` ; do if [ ! -e $W/$dir ] ; then - /bin/cp -R "$srcdir"/$dir $W/$dir + cp -R "$srcdir"/$dir $W/$dir fi done for dir in `echo lz4` ; do if [ ! -e $W/$dir ] ; then - /bin/cp -R "$srcdir"/$dir $W/$dir + cp -R "$srcdir"/$dir $W/$dir fi done diff --git a/racket/src/ChezScheme/zlib/contrib/minizip/Makefile b/racket/src/ChezScheme/zlib/contrib/minizip/Makefile index 84eaad20d4..784beb0e1e 100644 --- a/racket/src/ChezScheme/zlib/contrib/minizip/Makefile +++ b/racket/src/ChezScheme/zlib/contrib/minizip/Makefile @@ -22,4 +22,4 @@ test: miniunz minizip ./miniunz test.zip clean: - /bin/rm -f *.o *~ minizip miniunz + rm -f *.o *~ minizip miniunz