[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.5 README.txt:1.8 python_recipes.mk:1.4 python_targets.mk:1.3 zinstance_targets.mk:1.4

[Chris McDonough]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv24659

Modified Files:
	Makefile.zinstance README.txt python_recipes.mk 
	python_targets.mk zinstance_targets.mk 
Log Message:
Changed to allow for non-RedHat systems.


=== NZO_SiteLayout/Makefile.zinstance 1.4 => 1.5 ===
 ${INSTANCE_ROOT_TARGETS} \
 ${PRODUCT_ROOT_TARGETS} \
-/etc/rc.d/init.d/zope_${INSTANCE_NAME} \
-/etc/logrotate.d/zope_${INSTANCE_NAME} \
+$(if ${NON_REDHAT}, "", ${REDHAT_ROOT_TARGETS}) \
 
 BIN_TARGETS=\
 ${INSTANCE_BIN_TARGETS} \


=== NZO_SiteLayout/README.txt 1.7 => 1.8 ===
       openldap
       sudo
+      man2html
+
+    (see the end of this document for notes on building
+     on non-Redhat systems)
 
   - As the root user, create a "zope" user on the newly set up system::
 
@@ -124,6 +128,15 @@
 
        sudo /etc/rc.d/init.d/zope_{INSTANCE_NAME} start
 
+    You may also start the instance by invoking the zopectl script for
+    the instance::
+
+       bin/zctl-{INSTANCE_NAME} start
+
+    You can get an interactive session with zopectl by entering::
+
+       bin/zctl-{INSTANCE_NAME}
+
     All Zope logfiles are written to the "log" directory inside a
     subdir named after your Zope's INSTANCE_NAME.  To ensure the site
     started correctly, examine the "debug.log" logfile for your
@@ -194,3 +207,20 @@
  The same general pattern applies for every Product used in your
  instance home.
 
+Notes for installing on non-RedHat systems
+
+  You don't need the init scripts.  Pass in NON_REDHAT=1
+  as an argument to buildinstance, e.g.::
+
+    NON_REDHAT=1 site-layout/buildinstance
+
+  This makes the sudo parts of the script that try to
+  install things into /etc/rc.d/init.d and /etc/logrotate.d
+  go away.
+
+Notes for installing on Debian
+
+  You'll need to get the following debian packages to
+  service the instance dependencies::
+
+     libldap2-dev


=== NZO_SiteLayout/python_recipes.mk 1.3 => 1.4 ===
 	@${TRUE}
 
-${PYTHON_MAN_DOC_TARGETS}: doc/%.html : opt/Python2/man/man1/%.1
-	${MAN2HTML} $< > $@
-
 python: bin/python
 
 python_usage:


=== NZO_SiteLayout/python_targets.mk 1.2 => 1.3 ===
 doc/python/pstats.html \
 
-PYTHON_MAN_DOC_TARGETS=\
-doc/python/python.html
-
 PYTHON_DOC_TARGETS=\
 ${PYTHON_PYDOC_TARGETS} \
-${PYTHON_MAN_DOC_TARGETS}


=== NZO_SiteLayout/zinstance_targets.mk 1.3 => 1.4 ===
 #    USE_ZEO_SERVER={1 if ZEO server is used, 0 if local FileStorage}
 #=======================================================================
+REDHAT_ROOT_TARGETS=\
+/etc/rc.d/init.d/zope_${INSTANCE_NAME} \
+/etc/logrotate.d/zope_${INSTANCE_NAME} \
 
 INSTANCE_ROOT_TARGETS=\
 tmp \