[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.1.2.4

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv27633/inst

Modified Files:
      Tag: chrism-install-branch
	Makefile.in 
Log Message:
Dont copy make_instance.py file, link instead.

Move a comment from the configure script to the Makefile.


=== Zope/inst/Makefile.in 1.1.2.3 => 1.1.2.4 ===
--- Zope/inst/Makefile.in:1.1.2.3	Sun Sep 29 17:48:24 2002
+++ Zope/inst/Makefile.in	Sun Sep 29 20:02:31 2002
@@ -30,9 +30,29 @@
 	@echo to run a Zope instance directly from the build directory\).
 	@echo
 
-# hack links which should go away once we can rearrange the CVS
-# repository without effecting our ability to obtain updates from
-# the trunk.
+# Zope has a number of directories in its top-level source checkout
+# which should really be treated as subdirectories of two "skeleton"
+# directories which are copied wholesale during the 'make install' and
+# 'makeinstance' steps of the installation process.  The top-level directories
+# which should be subdirs of the 'make install' skeleton directory include
+# 'doc', 'pcgi', 'Extensions', 'utilities' (which should maybe be named 'bin')
+# and 'import'.  The top-level directory which should be a subdir of the
+# 'makeinstance'skeleton directory is 'var'.  It would be nice on this branch
+# to just move each of them into a 'skeleton' subdirectory.
+
+# But since we keep Zope in CVS, and because CVS has pretty fundamental
+# problems with directory moves, it's not a good idea at the moment to move
+# these directories until we're closer to a merge point, as it will become
+# difficult to keep the branch in sync with the Zope head if we perform
+# the moves now.
+
+# We work around this issue by linking top-level directories into an
+# install skeleton directory below.  
+
+# This hack will be removed when we have the go-ahead to merge this branch
+# into the trunk.  At that time, we should actually move these directories to
+# the directories specified by their link targets below.
+
 hacklinks:
 	${CD} "${SKEL_DIR}" && \
           ${LN} ../../pcgi . && \
@@ -40,7 +60,6 @@
           ${LN} ../../Extensions . && \
           ${LN} ../../import . && \
           ${LN} ../../utilities . && \
-          ${LN} ../../var . && \
           ${LN} ../../bin .
 	${CD} "${SKEL_DIR}/inst/skel" && \
           ${LN} ../../../../var .
@@ -51,7 +70,8 @@
 links:
 	${CD} "${SKEL_DIR}/inst" && \
            ${LN} ../../file_from_infile.py . && \
-           ${LN} ../../install.py .
+           ${LN} ../../install.py . && \
+           ${LN} ../../in/make_instance.py.in make_instance.py 
 
 install: build
 	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"