From e31cadd943472d496941716305a9f957c7c3f703 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 31 Oct 1995 23:29:14 +0000
Subject: [PATCH] Save the operating-system-specific loading files under
 separate names, so that multiple operating systems may be supported from the
 same build-directory.

---
 v7/src/edwin/edwin.sf | 18 +++++++++---------
 v7/src/edwin/make.scm |  9 +++++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/v7/src/edwin/edwin.sf b/v7/src/edwin/edwin.sf
index 1be21a0b6..3a811d860 100644
--- a/v7/src/edwin/edwin.sf
+++ b/v7/src/edwin/edwin.sf
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: edwin.sf,v 1.13 1995/10/31 23:26:48 cph Exp $
+;;;	$Id: edwin.sf,v 1.14 1995/10/31 23:29:14 cph Exp $
 ;;;
 ;;;	Copyright (c) 1991-95 Massachusetts Institute of Technology
 ;;;
@@ -104,13 +104,13 @@
 	 ((NT) "edwinw32")
 	 ((OS2) "edwinos2")
 	 ((UNIX) "edwinunx")
-	 (else "edwin"))))
-  (if (not (string=? name "edwin"))
-      (copy-file "edwin.pkg" (pathname-new-type name "pkg")))
+	 (else "edwinunk"))))
+  (copy-file "edwin.pkg" (pathname-new-type name "pkg"))
   (generate name)
-  (sf (pathname-new-type name "con")))
+  (sf (pathname-new-type name "con"))
+  (if (and (file-exists? (pathname-new-type name "avd"))
+	   (not (file-processed? name "avd" "bad")))
+      (fasdump (read-file (pathname-new-type name "avd"))
+	       (pathname-new-type name "bad"))))
 (if (not (file-processed? "edwin" "ldr" "bld"))
-    (sf "edwin.ldr"))
-(if (and (file-exists? "edwin.avd")
-	 (not (file-processed? "edwin" "avd" "bad")))
-    (fasdump (read-file "edwin.avd") "edwin.bad"))
\ No newline at end of file
+    (sf "edwin.ldr"))
\ No newline at end of file
diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm
index bca542f70..a2c374db3 100644
--- a/v7/src/edwin/make.scm
+++ b/v7/src/edwin/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 3.86 1995/05/20 10:20:45 cph Exp $
+$Id: make.scm,v 3.87 1995/10/31 23:26:55 cph Exp $
 
 Copyright (c) 1989-94 Massachusetts Institute of Technology
 
@@ -46,7 +46,12 @@ MIT in each case. |#
      (lambda ()
        (declare-shared-library "edwin" (lambda () true))
        (package/system-loader
-	"edwin"
+	(case microcode-id/operating-system
+	  ((DOS) "edwindos")
+	  ((NT) "edwinw32")
+	  ((OS2) "edwinos2")
+	  ((UNIX) "edwinunx")
+	  (else "edwin"))
 	`((os-type . ,microcode-id/operating-system))
 	'QUERY)))))
 (add-system! (make-system "Edwin" 3 86 '()))
\ No newline at end of file
-- 
2.25.1