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

Chris McDonough chrism@zope.com
Sat, 5 Oct 2002 22:55:12 -0400


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

Modified Files:
      Tag: chrism-install-branch
	Makefile.in 
Log Message:
Split up zctl into a stub and a library.


=== Zope/inst/Makefile.in 1.1.2.4 => 1.1.2.5 ===
--- Zope/inst/Makefile.in:1.1.2.4	Sun Sep 29 20:02:31 2002
+++ Zope/inst/Makefile.in	Sat Oct  5 22:54:41 2002
@@ -16,6 +16,7 @@
 XARGS=xargs
 CD=cd
 LN=ln -sf
+CP=cp
 TOUCH=touch
 INSTALL_COPY="${PYTHON}" "${INST_DIR}/install.py" --copylinks
 WRITE_INFILE="${PYTHON}" "${INST_DIR}/file_from_infile.py"
@@ -64,14 +65,16 @@
 	${CD} "${SKEL_DIR}/inst/skel" && \
           ${LN} ../../../../var .
 
-# links to reduce code duplication since both the zope_home installer
+# copies to reduce code duplication since both the zope_home installer
 # and the instance_home installer need make_instance, file_from_infile,
 # and install
+# we can't link these because Python becomes confused about module
+# imports if we do so.
 links:
 	${CD} "${SKEL_DIR}/inst" && \
-           ${LN} ../../file_from_infile.py . && \
-           ${LN} ../../install.py . && \
-           ${LN} ../../in/make_instance.py.in make_instance.py 
+           ${CP} ../../file_from_infile.py . && \
+           ${CP} ../../install.py . && \
+           ${CP} ../../in/make_instance.py.in make_instance.py 
 
 install: build
 	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"