[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.6 Makefile.zope:1.5 cvs.mk:1.6

[Chris McDonough]

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

Modified Files:
	Makefile.zinstance Makefile.zope cvs.mk 
Log Message:
Made NON_REDHAT work, changed CMF checkout to use HEAD.


=== NZO_SiteLayout/Makefile.zinstance 1.5 => 1.6 ===
 ZOPE_CHECKOUT=src/Zope-2.5-head
 ZEO_CHECKOUT=src/ZEO-1.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+CMF_CHECKOUT=src/CMF-head
 
 include python_targets.mk
 include zope_targets.mk
@@ -41,7 +41,7 @@
 ROOT_TARGETS=\
 ${INSTANCE_ROOT_TARGETS} \
 ${PRODUCT_ROOT_TARGETS} \
-$(if ${NON_REDHAT}, "", ${REDHAT_ROOT_TARGETS}) \
+$(if ${NON_REDHAT}, ${NOTHING}, ${REDHAT_ROOT_TARGETS}) \
 
 BIN_TARGETS=\
 ${INSTANCE_BIN_TARGETS} \


=== NZO_SiteLayout/Makefile.zope 1.4 => 1.5 ===
 ZOPE_CHECKOUT=src/Zope-2.5-head
 ZEO_CHECKOUT=src/ZEO-1.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+CMF_CHECKOUT=src/CMF-head
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/cvs.mk 1.5 => 1.6 ===
 src/CMF-1.3: CVS_TAG=-r CMF-1_3-release
 
-src/CMF-1.3-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/CMF-1.3-head: CVS_MODULE=CMF
-src/CMF-1.3-head: CVS_TAG=-r CMF-1_3-branch
+src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-head: CVS_MODULE=CMF
+src/CMF-head: CVS_TAG=
 
 #   Squid versions