[Zope-Checkins] CVS: Zope - configure:1.1.4.10

Chris McDonough chrism@zope.com
Sun, 29 Sep 2002 20:03:02 -0400


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

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

Move a comment from the configure script to the Makefile.


=== Zope/configure 1.1.4.9 => 1.1.4.10 ===
--- Zope/configure:1.1.4.9	Sun Sep 29 17:46:23 2002
+++ Zope/configure	Sun Sep 29 20:02:31 2002
@@ -111,29 +111,6 @@
     get_python
 fi
 
-# 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.
-
 PYTHON=$FOUND
 # run the Python configurator
 $PYTHON $HERE/inst/configure.py $NEWOPTS