diff --git a/LOG b/LOG
index d4460e6203..9276d1dd6d 100644
--- a/LOG
+++ b/LOG
@@ -1202,3 +1202,5 @@
compile-whole-library when a top-level expression is discovered while
processing a wpo file.
compile.ss
+- minor build and new-release updates
+ checkin, newrelease, Makefile.in, Makefile-workarea.in
diff --git a/checkin b/checkin
index 5df71910d2..6db76bcfce 100755
--- a/checkin
+++ b/checkin
@@ -62,7 +62,7 @@ if (-e $W/scheme.1.in) then
endif
endif
-set tmpsdirs = (. c mats s examples unicode makefiles csug release_notes bintar rpm pkg)
+set tmpsdirs = (. c mats s examples unicode makefiles csug release_notes wininstall bintar rpm pkg)
set sdirs = ()
foreach x ($tmpsdirs)
if (!(-e $x)) then
@@ -101,6 +101,7 @@ foreach x ($sdirs)
case mats:
case benchmarks:
case examples:
+ case wininstall:
case bintar:
case rpm:
case pkg:
diff --git a/makefiles/Makefile-workarea.in b/makefiles/Makefile-workarea.in
index b4078005fb..8aa0f98882 100644
--- a/makefiles/Makefile-workarea.in
+++ b/makefiles/Makefile-workarea.in
@@ -17,8 +17,8 @@ MAKEFLAGS += --no-print-directory
PREFIX=
build:
- (cd c ; $(MAKE))
- (cd s ; $(MAKE) bootstrap)
+ (cd c && $(MAKE))
+ (cd s && $(MAKE) bootstrap)
install: build
$(MAKE) -f Mf-install
@@ -27,7 +27,7 @@ uninstall:
$(MAKE) -f Mf-install uninstall
test: build
- (cd mats ; $(MAKE) allx)
+ (cd mats && $(MAKE) allx)
@echo "test run complete. check $(PREFIX)mats/summary for errors."
bootfiles: build
@@ -44,11 +44,11 @@ create-pkg: create-bintar
clean:
rm -f petite.1 scheme.1
- (cd s ; $(MAKE) clean)
- (cd c ; $(MAKE) clean)
- (cd mats ; $(MAKE) clean)
- (cd examples ; $(MAKE) clean)
- (cd bintar ; $(MAKE) clean)
- (cd rpm ; $(MAKE) clean)
- (cd pkg ; $(MAKE) clean)
+ (cd s && $(MAKE) clean)
+ (cd c && $(MAKE) clean)
+ (cd mats && $(MAKE) clean)
+ (cd examples && $(MAKE) clean)
+ (cd bintar && $(MAKE) clean)
+ (cd rpm && $(MAKE) clean)
+ (cd pkg && $(MAKE) clean)
rm -f Make.out
diff --git a/makefiles/Makefile.in b/makefiles/Makefile.in
index 5c0846b0b0..0308ef0492 100644
--- a/makefiles/Makefile.in
+++ b/makefiles/Makefile.in
@@ -47,9 +47,9 @@ clean:
(cd $(workarea) && $(MAKE) clean)
distclean:
- (cd csug ; if [ -e Makefile ] ; then make reallyreallyclean ; fi)
+ (cd csug && if [ -e Makefile ] ; then make reallyreallyclean ; fi)
rm -f csug/Makefile
- (cd release_notes ; if [ -e Makefile ] ; then make reallyreallyclean ; fi)
+ (cd release_notes && if [ -e Makefile ] ; then make reallyreallyclean ; fi)
rm -f release_notes/Makefile
rm -rf $(workarea)
rm -f Makefile
diff --git a/newrelease b/newrelease
index 4a630fe33d..54072cfeae 100755
--- a/newrelease
+++ b/newrelease
@@ -101,8 +101,8 @@ set updatedfiles = ($updatedfiles NOTICE)
mkdir makefiles
sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makefiles/Mf-install.in
-sed -e "s/csug[0-9]\.[0-9]\(\.[0-9]\)*/csug$R/" -e "s/csug[0-9]_[0-9]\(_[0-9]\)*/csug$underscoreR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in
-set updatedfiles = ($updatedfiles makefiles/Mf-install.in)
+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 updatedfiles = ($updatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in)
/bin/rm scheme.1.in
sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)*/Chez Scheme Version $R/" ../scheme.1.in > scheme.1.in
@@ -147,12 +147,21 @@ sed -e "s/thisversion{Version [^ ]*}/thisversion{Version $R}/" ../release_notes/
set updatedfiles = ($updatedfiles release_notes/release_notes.stex)
mkdir csug
-sed -e "s/Revised \(.*\) for Chez Scheme Version [^ ]*\./Revised \\INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version $R./" ../csug/copyright.stex > csug/copyright.stex
-sed -e "s/Revised \(.*\) for Chez Scheme Version [^ ]*
/Revised \\INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version $R
/" ../csug/csug.stex > csug/csug.stex
-set updatedfiles = ($updatedfiles csug/csug.stex)
+sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*\./Revised\1for Chez Scheme Version $R./" ../csug/copyright.stex > csug/copyright.stex
+sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*
/Revised\1for Chez Scheme Version $R
/" ../csug/csug.stex > csug/csug.stex
+set updatedfiles = ($updatedfiles csug/copyright.stex csug/csug.stex)
+
+/bin/rm -f rpm/Makefile
+sed -e "s/^v = .*/v = $R/" ../rpm/Makefile > rpm/Makefile
+set updatedfiles = ($updatedfiles rpm/Makefile)
+
+/bin/rm -f pkg/Makefile
+sed -e "s/^v = .*/v = $R/" ../pkg/Makefile > pkg/Makefile
+set updatedfiles = ($updatedfiles pkg/Makefile)
mkdir wininstall
sed -e "s/VERSION := .*/VERSION := $R/" ../wininstall/Makefile > wininstall/Makefile
+set updatedfiles = ($updatedfiles wininstall/Makefile)
foreach fn (wininstall/{,t}{a6,i3}nt.wxs)
set updatedfiles = ($updatedfiles $fn)
sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/" ../$fn > $fn