--- a/Project.st Mon Jan 10 14:56:34 2000 +0100
+++ b/Project.st Mon Jan 10 17:02:52 2000 +0100
@@ -1816,23 +1816,30 @@
"creates an initial Makefile from a Make.proto file.
Requires the stmkmf script"
- |d top transcript|
+ |d top transcript stmkmf|
OperatingSystem isUNIXlike ifTrue:[
Transcript current showCR:'creating Makefile'.
d := directoryName asFilename pathName.
- top := (d , '/' , (self findTopFrom:directoryName)) asFilename pathName.
+ top := (d , '/' , (self findTopFrom:directoryName)) asFilename.
+
+ (top construct:'rules') exists ifFalse:[
+ self warn:'Could not execute stmkmf - no TOP/rules directory found.'
+ ].
+ (stmkmf := ((top construct:'rules') construct:'stmkmf')) exists ifFalse:[
+ self warn:'Could not execute stmkmf - no TOP/rules/stmkmf found.'
+ ].
transcript := Transcript current.
(OperatingSystem
- executeCommand:('sh ' , top , '/rules/stmkmf')
+ executeCommand:('sh ' , stmkmf pathName)
outputTo:transcript
errorTo:transcript
inDirectory:d
) ifFalse:[
- self warn:'Could not execute stmkmf - no Makefile built.'
+ self warn:'Error executing stmkmf - no Makefile built.'
].
].
self createNTMakefile.
@@ -3482,6 +3489,6 @@
!Project class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.136 2000-01-10 13:56:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.137 2000-01-10 16:02:52 cg Exp $'
! !
Project initialize!