From: Guillermo J. Rozas <edu/mit/csail/zurich/gjr>
Date: Mon, 15 Nov 1993 05:59:13 +0000 (+0000)
Subject: Fix conflict when timestamps have been disabled.
X-Git-Tag: 20090517-FFI~7506
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d044609c5381fc9b2c9ad5bd3cfafc64fe550c8c;p=mit-scheme.git

Fix conflict when timestamps have been disabled.
---

diff --git a/v7/src/compiler/machines/C/cout.scm b/v7/src/compiler/machines/C/cout.scm
index b8ce81a52..bbff69055 100644
--- a/v7/src/compiler/machines/C/cout.scm
+++ b/v7/src/compiler/machines/C/cout.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: cout.scm,v 1.15 1993/11/13 19:24:04 gjr Exp $
+$Id: cout.scm,v 1.16 1993/11/15 05:59:13 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -89,7 +89,7 @@ MIT in each case. |#
 			    suffix))
 	    ((not path)
 	     (string-append default suffix time-stamp))
-	    ((string-null? suffix)
+	    ((or (string-null? suffix) *disable-timestamps?*)
 	     (let ((dir (pathname-directory path)))
 	       (string-append (if (or (not dir) (null? dir))
 				  default
@@ -97,7 +97,8 @@ MIT in each case. |#
 				   (car (last-pair dir))))
 			      "_"
 			      (canonicalize-label-name (pathname-name path))
-			      midfix)))
+			      midfix
+			      suffix)))
 	    (else
 	     (string-append (canonicalize-label-name (pathname-name path))
 			    "_"