--- a/AbstractOperatingSystem.st	Sat Oct 26 11:22:22 2013 +0100
+++ b/AbstractOperatingSystem.st	Mon Nov 04 11:11:22 2013 -0300
@@ -4244,7 +4244,7 @@
     "/
     appDirName := self pathOfSTXExecutable asFilename directory.
     (packagePath includes:appDirName) ifFalse:[
-	packagePath add:appDirName.
+        packagePath add:appDirName.
     ].
 
     "/
@@ -4254,27 +4254,27 @@
     appDir := self pathOfSTXExecutable asFilename directory directory.
     dirName := appDir pathName.
     (packagePath includes:dirName) ifFalse:[
-	packagePath add:dirName.
+        packagePath add:dirName.
     ].
 
     homeDirName := OperatingSystem getHomeDirectory.
     homeDirName notNil ifTrue:[
-	"/
-	"/ a users private smalltalk directory in its home (login) directory:
-	"/      $HOME/.smalltalk/packages    or $HOME\smalltalk\packages
-	"/
-	OperatingSystem isUNIXlike ifTrue:[
-	    priv := '.smalltalk'.
-	] ifFalse:[
-	    priv := 'smalltalk'.
-	].
-	userPrivateSTXDir := homeDirName asFilename / priv.
-	(userPrivateSTXDir isDirectory) ifTrue:[
-	    dirName :=  userPrivateSTXDir pathName.
-	    (packagePath includes:dirName) ifFalse:[
-		packagePath add:dirName
-	    ]
-	].
+        "/
+        "/ a users private smalltalk directory in its home (login) directory:
+        "/      $HOME/.smalltalk/packages    or $HOME\smalltalk\packages
+        "/
+        OperatingSystem isUNIXlike ifTrue:[
+            priv := '.smalltalk'.
+        ] ifFalse:[
+            priv := 'smalltalk'.
+        ].
+        userPrivateSTXDir := homeDirName asFilename / priv.
+        (userPrivateSTXDir isDirectory) ifTrue:[
+            dirName :=  userPrivateSTXDir pathName.
+            (packagePath includes:dirName) ifFalse:[
+                packagePath add:dirName
+            ]
+        ].
     ].
 
     "/
@@ -4283,41 +4283,45 @@
     "/
     topDirName := OperatingSystem getEnvironment:'STX_TOPDIR'.
     topDirName notNil ifTrue:[
-	(packagePath includes:topDirName) ifFalse:[
-	    packagePath add:topDirName
-	].
+        (packagePath includes:topDirName) ifFalse:[
+            packagePath add:topDirName
+        ].
     ].
 
     packagePath := packagePath select:[:each | (each asFilename / 'packages') exists]
-			       thenCollect:[:each | (each asFilename constructString:'packages')].
+                               thenCollect:[:each | (each asFilename constructString:'packages')].
 
     "
       unconditionally prepend all directories from $STX_PACKAGEPATH
     "
     (dirName := OperatingSystem getEnvironment:'STX_PACKAGEPATH') notNil ifTrue:[
-	dirName := dirName asCollectionOfSubstringsSeparatedBy:$:.
-	dirName reverseDo:[:eachDirectoryName|
-	    (packagePath includes:eachDirectoryName) ifFalse:[
-		packagePath addFirst:eachDirectoryName.
-	    ].
-	].
+        dirName := dirName asCollectionOfSubstringsSeparatedBy:$:.
+        dirName reverseDo:[:eachDirectoryName|
+            (packagePath includes:eachDirectoryName) ifFalse:[
+                packagePath addFirst:eachDirectoryName.
+            ].
+        ].
     ].
 
     "maybe the sources are kept in a central place..."
     (appDir / 'source') isDirectory ifTrue:[
-	packagePath add:(appDir / 'source') pathName.
+        packagePath add:(appDir / 'source') pathName.
     ].
 
     "maybe we are running in the build environment:  XXX/stx    /projects /smalltalk
-						or:  XXX/exept  /expecco  /application
+                                                or:  XXX/exept  /expecco  /application
      - if XXX/stx/libbasic exists, add XXX to the package path"
 
     topDirName isNil ifTrue:[
-	"appdir is now: projects"
-	appDir := appDir directory directory.
-	(appDir / 'stx' / 'libbasic') isDirectory ifTrue:[
-	    packagePath add:appDir pathName.
-	].
+        "appdir is now: projects"
+        appDir := appDir directory directory.
+        (appDir / 'stx' / 'libbasic') isDirectory ifTrue:[
+            appDir pathName = homeDirName ifTrue:[
+                "but take care, it may be directly in the home directory"
+                appDir := appDir / 'stx'.
+            ].
+            packagePath add:appDir pathName.
+        ].
     ].
 
     ^ packagePath
@@ -7261,11 +7265,11 @@
 !AbstractOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.244 2013-09-25 18:42:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.245 2013-10-14 19:53:49 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.244 2013-09-25 18:42:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.245 2013-10-14 19:53:49 stefan Exp $'
 ! !