[zopeorg-checkins] CVS: NZO_SiteLayoutRedux - cvs.mk:1.3 tools.mk:1.2 zinstance_recipes.mk:1.3

[Chris McDonough]

Update of /cvs-zopeorg/NZO_SiteLayoutRedux
In directory cvs.zope.org:/tmp/cvs-serv22466

Modified Files:
	cvs.mk tools.mk zinstance_recipes.mk 
Log Message:
Use pserver, copy instead of link, and put dbtab.conf in the right place.


=== NZO_SiteLayoutRedux/cvs.mk 1.2 => 1.3 ===
     CUSTOM_CVS_REPOSITORY=:ext:${CVS_USER}@${CUSTOM_REPO_TAIL}
 endif
 
+PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/python
+ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
+SQUID_CVS_REPOSITORY=:pserver:anoncvs at cvs.squid-cache.org:/squid
+ZOPEORG_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-zopeorg
+COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/collective
+ZWIKI_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/zwiki
+BACKTALK_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/backtalk
+PLONE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/plone
+FORMULATOR_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/formulator
+
+#-- pserver mode broken
 #PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/python
-#ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
+#ZOPE_CVS_REPOSITORY=:ext:cvs.zope.org:/cvs-repository
 #SQUID_CVS_REPOSITORY=:pserver:anoncvs at cvs.squid-cache.org:/squid
-#ZOPEORG_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-zopeorg
+#ZOPEORG_CVS_REPOSITORY=:ext:cvs.zope.org:/cvs-zopeorg
 #COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/collective
 #ZWIKI_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/zwiki
 #BACKTALK_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/backtalk
 #PLONE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/plone
 #FORMULATOR_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/formulator
-
-#-- pserver mode broken
-#PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/python
-ZOPE_CVS_REPOSITORY=:ext:cvs.zope.org:/cvs-repository
-SQUID_CVS_REPOSITORY=:pserver:anoncvs at cvs.squid-cache.org:/squid
-ZOPEORG_CVS_REPOSITORY=:ext:cvs.zope.org:/cvs-zopeorg
-COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/collective
-ZWIKI_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/zwiki
-BACKTALK_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/backtalk
-PLONE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/plone
-FORMULATOR_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/formulator
 
 
 CVS=CVS_RSH=ssh /usr/bin/cvs -z7 -q


=== NZO_SiteLayoutRedux/tools.mk 1.1.1.1 => 1.2 ===
 
 BASE_DIR=$(shell pwd)
 
-COPY_FROM_SRC=${LNDIR} # Use ${CPR} if you don't want links.
+COPY_FROM_SRC=${CPR} # Use ${CPR} if you don't want links.


=== NZO_SiteLayoutRedux/zinstance_recipes.mk 1.2 => 1.3 ===
 bin/zctl-${INSTANCE_NAME}: ${MAKEFILEDIR}/bin/zctlinstance.in bin/zopectl
 bin/zctl-${INSTANCE_NAME}: AFTERCREATE=${CHMOD} u+x $@
 var/${INSTANCE_NAME}/custom_zodb.py: ${MAKEFILEDIR}/var/zope/custom_zodb.py.in
+var/${INSTANCE_NAME}/dbtab.conf: ${MAKEFILEDIR}/etc/dbtab.conf.in
 etc/${INSTANCE_NAME}.conf: ${MAKEFILEDIR}/etc/zope.conf.in
-etc/dbtab.conf: ${MAKEFILEDIR}/etc/dbtab.conf.in
 
 SED_NEEDING=\
 bin/zopectl \
 var/${INSTANCE_NAME}/custom_zodb.py \
+var/${INSTANCE_NAME}/dbtab.conf \
 etc/${INSTANCE_NAME}.conf \
 bin/zctl-${INSTANCE_NAME} \
-etc/dbtab.conf \
 
 ${SED_NEEDING}:
 	${MKDIR} ${@D}