[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/zcml.py Adjusted Five.zcml to new skel location. I had an instance created in my buildout :(

[Hanno Schlichting]

Log message for revision 96815:
  Adjusted Five.zcml to new skel location. I had an instance created in my buildout :(
  

Changed:
  U   Zope/trunk/src/Products/Five/zcml.py

-=-
Modified: Zope/trunk/src/Products/Five/zcml.py
===================================================================
--- Zope/trunk/src/Products/Five/zcml.py	2009-02-20 13:16:04 UTC (rev 96814)
+++ Zope/trunk/src/Products/Five/zcml.py	2009-02-20 13:25:03 UTC (rev 96815)
@@ -16,6 +16,7 @@
 $Id$
 """
 import os
+import os.path
 from zope.configuration import xmlconfig
 
 _initialized = False
@@ -30,9 +31,15 @@
         return
     _initialized = True
 
+    import Globals
+    Globals.INSTANCE_HOME
+
     # load instance site configuration file
-    site_zcml = os.path.join(INSTANCE_HOME, "etc", "site.zcml")
-    skel_site_zcml = os.path.join(INSTANCE_HOME, "skel", "etc", "site.zcml")
+    site_zcml = os.path.join(Globals.INSTANCE_HOME, "etc", "site.zcml")
+
+    import Zope2.utilities
+    zope_utilities = os.path.dirname(Zope2.utilities.__file__)
+    skel_site_zcml = os.path.join(zope_utilities, "skel", "etc", "site.zcml")
     
     if os.path.exists(site_zcml):
         file = site_zcml