[Zope-CVS] CVS: Zope - Makefile.in:1.1.4.3 makeinstance.in:1.1.2.2

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Makefile.in makeinstance.in 
Log Message:
Made make_instance.py take getopt arguments to gather info programmatically
instead of interactively if necessary (for automated installs).

Changed Makefile to put quotes around paths as necessary to fix bug
reported by Jens

Cleaned up some output.


=== Zope/Makefile.in 1.1.4.2 => 1.1.4.3 ===
--- Zope/Makefile.in:1.1.4.2	Thu Aug 29 02:14:52 2002
+++ Zope/Makefile.in	Thu Aug 29 12:38:14 2002
@@ -3,7 +3,7 @@
 # We do as much as possible in Python in order to avoid needing to
 # learn autoconf or some other awful thing. ;-)
 
-PYTHON=%(python)s
+PYTHON="%(python)s"
 ZOPE_HOME=%(zope_home)s
 BUILD_DIR=%(build_dir)s
 RM=rm -rf
@@ -13,14 +13,14 @@
 .PHONY : clean install uninstall instance
 
 build:
-	${PYTHON} ${BUILD_DIR}/inst/compile_all.py
+	${PYTHON} "${BUILD_DIR}/inst/compile_all.py"
 	${PYTHON} -c "open('${BUILD_DIR}/build', 'w')"
 	@echo Zope built.  Next, do \'make install\' \(or \'make instance\'
 	@echo to run a Zope instance directly from the build directory\).
 	@echo
 
 install: build
-	${PYTHON} ${BUILD_DIR}/inst/source_install.py --src="${BUILD_DIR}"\
+	${PYTHON} "${BUILD_DIR}/inst/source_install.py" --src="${BUILD_DIR}"\
           --dst="${ZOPE_HOME}" --rm-from-dst="Makefile Makefile.in configure\
           stupid_clean w_pcgi.py wo_pcgi.py setup.py start stop build\
           inituser makeinstance.in *.pyc *.pyo"
@@ -29,12 +29,12 @@
 	@echo Now run \'${ZOPE_HOME}/makeinstance.\'
 
 instance: build
-	${PYTHON} ${BUILD_DIR}/inst/make_instance.py
+	${PYTHON} "${BUILD_DIR}/inst/make_instance.py"
 
 uninstall:
-	${RM} ${ZOPE_HOME}
+	${RM} "${ZOPE_HOME}"
 
 clean:
-	${FIND} ${BUILD_DIR} -name '*.o' -o -name '*.so' -o -name '*.py[co]' \
+	${FIND} "${BUILD_DIR}" -name '*.o' -o -name '*.so' -o -name '*.py[co]'\
           -o -name 'core*' | ${XARGS} rm -f
 	${RM} ${BUILD_DIR}/build


=== Zope/makeinstance.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/makeinstance.in:1.1.2.1	Wed Aug 28 00:12:30 2002
+++ Zope/makeinstance.in	Thu Aug 29 12:38:14 2002
@@ -1,2 +1,2 @@
 #!/bin/sh
-%(python)s %(zope_home)s/inst/make_instance.py
+%(python)s %(zope_home)s/inst/make_instance.py $@