--- a/Project.st	Sun Sep 26 16:13:55 1999 +0200
+++ b/Project.st	Sun Sep 26 16:19:27 1999 +0200
@@ -1558,17 +1558,34 @@
 
     |d top|
 
-    Transcript showCR:'creating Makefile'.
-
-    d := directoryName asFilename pathName.
-    top := (d , '/' , (self findTopFrom:directoryName)) asFilename pathName.
-
-    (OperatingSystem 
-	executeCommand:('sh ' , top , '/rules/stmkmf')
-	inDirectory:d) ifFalse:[
-	self warn:'Could not execute stmkmf - no Makefile built.'
+    OperatingSystem isUNIXlike ifTrue:[
+        Transcript showCR:'creating Makefile'.
+
+        d := directoryName asFilename pathName.
+        top := (d , '/' , (self findTopFrom:directoryName)) asFilename pathName.
+
+        (OperatingSystem 
+            executeCommand:('sh ' , top , '/rules/stmkmf')
+            inDirectory:d) ifFalse:[
+            self warn:'Could not execute stmkmf - no Makefile built.'
+        ].
+    ] ifFalse:[
+        OperatingSystem isMSWINDOWSlike ifTrue:[
+            self createNTMakefile
+        ] ifFalse:[
+            OperatingSystem isVMSlike ifTrue:[
+                self createVMSMakefile
+            ] ifFalse:[
+                OperatingSystem isMAClike ifTrue:[
+                    self createMacMakefile
+                ] ifFalse:[
+                    self warn:'Cannot create Makefile'
+                ]
+            ]
+        ]
     ].
 
+    "Modified: / 26.9.1999 / 16:18:29 / cg"
 !
 
 createProjectFiles
@@ -1991,12 +2008,12 @@
         topName := directoryName asFilename construct:relParent.
         ((topName construct:'stx') construct:'configurations') exists ifTrue:[
             ((topName construct:'stx') construct:'include') exists ifTrue:[
-                ^ relParent asFilename construct:'stx'.
+                ^ relParent asFilename constructString:'stx'.
             ]
         ].
         (topName construct:'configurations') exists ifTrue:[
             (topName construct:'include') exists ifTrue:[
-                ^ relParent 
+                ^ relParent name
             ]
         ].
         relParent := relParent asFilename constructString:'..'.
@@ -2010,7 +2027,7 @@
     ].
     ^ topName pathName
 
-    "Modified: / 26.9.1999 / 16:08:48 / cg"
+    "Modified: / 26.9.1999 / 16:15:14 / cg"
 ! !
 
 !Project methodsFor:'printing & storing'!
@@ -2765,6 +2782,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.113 1999-09-26 14:13:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.114 1999-09-26 14:19:27 cg Exp $'
 ! !
 Project initialize!