--- a/Win32OperatingSystem.st Thu Dec 23 22:50:12 1999 +0100
+++ b/Win32OperatingSystem.st Thu Dec 23 23:14:29 1999 +0100
@@ -5501,25 +5501,33 @@
defaultSystemPath
"XXX: this should be changed to ask the registry"
- |sysPath|
+ |sysPath libDirPath|
sysPath := super defaultSystemPath.
-
- #(
- '\smalltalk'
- '\programme\smalltalk'
- '\programme\exept\smalltalk'
- '\programs\smalltalk'
- '\programs\exept\smalltalk'
- ) do:[:d |
- (d asFilename isDirectory) ifTrue:[
- sysPath add:d
- ]
+ libDirPath := self stxLibDirPath.
+ libDirPath notNil ifTrue:[
+ "/ and also add the libDirPath from the registry ...
+ sysPath add:self stxLibDirPath.
+ ] ifFalse:[
+ #(
+ '\smalltalk'
+ '\programme\smalltalk'
+ '\programme\eXept\smalltalk'
+ '\programs\smalltalk'
+ '\programs\eXept\smalltalk'
+ ) do:[:d |
+ (d asFilename isDirectory) ifTrue:[
+ sysPath add:d.
+ sysPath add:(d , '\' , Smalltalk versionString).
+ ]
+ ].
].
"/ under windows, the commandName includes the path - good.
sysPath add:(Smalltalk commandName asFilename directoryName).
^ sysPath
+
+ "Modified: / 23.12.1999 / 23:16:31 / cg"
!
stxBinDirPath
@@ -8057,6 +8065,6 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.85 1999-12-23 21:50:12 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.86 1999-12-23 22:14:29 cg Exp $'
! !
Win32OperatingSystem initialize!