ZOPE_HOME="<<ZOPE_HOME>>"
INSTANCE_HOME="<<INSTANCE_HOME>>"
-CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+-SOFTWARE_HOME="<<SOFTWARE_HOME>>"
+CONFIG_FILE="<<CONFIG_FILE>>"
- SOFTWARE_HOME="<<SOFTWARE_HOME>>"
++SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
PYTHONPATH="$SOFTWARE_HOME"
export PYTHONPATH
diff -durN Zope-2.7.0-b2.orig/skel/bin/zopectl.in Zope-2.7.0-b2/skel/bin/zopectl.in
ZOPE_HOME="<<ZOPE_HOME>>"
INSTANCE_HOME="<<INSTANCE_HOME>>"
-CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+-SOFTWARE_HOME="<<SOFTWARE_HOME>>"
+CONFIG_FILE="<<CONFIG_FILE>>"
- SOFTWARE_HOME="<<SOFTWARE_HOME>>"
++SOFTWARE_HOME="<<ZOPE_HOME>>/lib/python"
PYTHONPATH="$SOFTWARE_HOME"
export PYTHONPATH
diff -durN Zope-2.7.0-b2.orig/skel/etc/zope.conf.in Zope-2.7.0-b2/skel/etc/zope.conf.in