From b3cf76c3e8535da575ddf2f1d8d4e3d5a7c1c355 Mon Sep 17 00:00:00 2001
From: dyb <dyb@scheme.com>
Date: Wed, 28 Mar 2018 09:25:20 -0700
Subject: [PATCH] Makefile-csug.in install target is now consistent with the
 project page csug directory and pdf names, and newrelease now updates
 Makefile-csug.in accordingly.

original commit: 63b1e7237d82d3af3ec594c35e3d5b9c7e58ae54
---
 makefiles/Makefile-csug.in | 5 +++--
 newrelease                 | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in
index 8254e67130..df24092b45 100644
--- a/makefiles/Makefile-csug.in
+++ b/makefiles/Makefile-csug.in
@@ -1,7 +1,7 @@
 m = $(m)
 Scheme=../$m/bin/$m/scheme -b ../$m/boot/$m/petite.boot -b ../$m/boot/$m/scheme.boot
 STEXLIB=../stex
-installdir=/tmp/csug9
+installdir=/tmp/csug9.5
 INSTALL=../$m/installsh
 
 x = csug
@@ -16,7 +16,8 @@ target: logcheck1 logcheck2 checklibs $(x).html $(x).pdf
 
 install: target
 	$(INSTALL) -m 2755 -d $(installdir)
-	$(INSTALL) -m 0644 --ifdiff *.html *.pdf *.css $(installdir)
+	$(INSTALL) -m 0644 --ifdiff *.html *.css $(installdir)
+	$(INSTALL) -m 0644 --ifdiff csug.pdf $(installdir)/csug9_5.pdf
 	$(INSTALL) -m 2755 -d $(installdir)/canned
 	$(INSTALL) -m 0644 --ifdiff canned/* $(installdir)/canned
 	$(INSTALL) -m 2755 -d $(installdir)/gifs
diff --git a/newrelease b/newrelease
index 01b7f5fdef..34803ab74c 100755
--- a/newrelease
+++ b/newrelease
@@ -35,6 +35,9 @@ if ({(echo -n "$1" | grep '^[0-9]\.[0-9]$' >& /dev/null)}) then
 
   # set ZR to release number w/o "."
   set ZR = $MR$mR
+
+  # set underscoreR to release number w/ "_" in place of "."
+  set underscoreR = $MR"_"$mR
 else if ({(echo -n "$1" | grep '^[0-9]\.[0-9]\.[0-9]$' >& /dev/null)}) then
   # set MR to major release number
   set tmp = $R:r
@@ -48,6 +51,9 @@ else if ({(echo -n "$1" | grep '^[0-9]\.[0-9]\.[0-9]$' >& /dev/null)}) then
 
   # set ZR to release number w/o "."
   set ZR = $MR$mR$bR
+
+  # set underscoreR to release number w/ "_" in place of "."
+  set underscoreR = $MR"_"$mR"_"$bR
 else
   echo "invalid release number $R"
   exit 1
@@ -87,6 +93,7 @@ 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)
 
 /bin/rm scheme.1.in