[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.1.2.6 Makefile.win.in:1.1.2.2

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Makefile.in Makefile.win.in 
Log Message:
Make instance home installs work a bit better by changing the mode of the make_instance.py file
to executable.

Various cleanups and makefile mods.


=== Zope/inst/Makefile.in 1.1.2.5 => 1.1.2.6 ===
--- Zope/inst/Makefile.in:1.1.2.5	Sat Oct  5 22:54:41 2002
+++ Zope/inst/Makefile.in	Tue Oct  8 19:15:53 2002
@@ -12,6 +12,7 @@
 INFILE_DIR=${INST_DIR}/in
 
 RM=rm -f
+RMRF=rm -rf
 FIND=find
 XARGS=xargs
 CD=cd
@@ -72,9 +73,9 @@
 # imports if we do so.
 links:
 	${CD} "${SKEL_DIR}/inst" && \
-           ${CP} ../../file_from_infile.py . && \
-           ${CP} ../../install.py . && \
-           ${CP} ../../in/make_instance.py.in make_instance.py 
+           ${INSTALL_COPY} ../../file_from_infile.py file_from_infile.py && \
+           ${INSTALL_COPY} ../../install.py install.py && \
+           ${WRITE_INFILE} ../../in/make_instance.py.in make_instance.py
 
 install: build
 	${INSTALL_COPY} "${SKEL_DIR}" "${TARGET_DIR}"
@@ -90,12 +91,9 @@
           --zopehome="${BUILD_DIR}"
 
 uninstall:
-	${RM} "${TARGET_DIR}"
+	${RMRF} "${TARGET_DIR}"
 
-clean:
-	${FIND} "${BUILD_DIR}" -name '*.o' -o -name '*.so' -o -name \
-          '*.py[co]' -o -name 'core*' | ${XARGS} rm -f
-	${RM} "${BUILD_DIR}/build"
+rmlinks:
 	${RM} "${SKEL_DIR}/pcgi"
 	${RM} "${SKEL_DIR}/doc"
 	${RM} "${SKEL_DIR}/Extensions"
@@ -103,5 +101,11 @@
 	${RM} "${SKEL_DIR}/utilities"
 	${RM} "${SKEL_DIR}/bin"
 	${RM} "${SKEL_DIR}/inst/skel/var"
+	${RM} "${SKEL_DIR}/inst/make_instance.py"
 	${RM} "${SKEL_DIR}/inst/file_from_infile.py"
 	${RM} "${SKEL_DIR}/inst/install.py"
+
+clean: rmlinks
+	${RM} "${BUILD_DIR}/build"
+	${FIND} "${BUILD_DIR}" -name '*.o' -o -name '*.so' -o -name \
+          '*.py[co]' -o -name 'core*' | ${XARGS} rm -f


=== Zope/inst/Makefile.win.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/inst/Makefile.win.in:1.1.2.1	Sat Oct  5 18:47:03 2002
+++ Zope/inst/Makefile.win.in	Tue Oct  8 19:15:53 2002
@@ -68,7 +68,7 @@
 links:
         $(COPY) inst\file_from_infile.py "$(SKEL_DIR)\inst\file_from_infile.py"
        	$(COPY) inst\install.py "$(SKEL_DIR)\inst\install.py"
-        $(COPY) inst\in\make_instance.py.in "$(SKEL_DIR)\inst\make_instance.py"
+        $(WRITE_INFILE) inst\in\make_instance.py.in "$(SKEL_DIR)\inst\make_instance.py"
 
 install: build
 	$(INSTALL_COPY) "$(SKEL_DIR)" "$(TARGET_DIR)"
@@ -86,7 +86,7 @@
 uninstall:
 	$(RMDIR) "$(TARGET_DIR)"
 
-clean:
+rmlinks:
 	$(RMDIR) "$(SKEL_DIR)\pcgi"
 	$(RMDIR) "$(SKEL_DIR)\doc"
 	$(RMDIR) "$(SKEL_DIR)\Extensions"
@@ -96,5 +96,8 @@
 	$(RMDIR) "$(SKEL_DIR)\inst\skel\var"
 	$(RM) "$(SKEL_DIR)\inst\file_from_infile.py"
 	$(RM) "$(SKEL_DIR)\inst\install.py"
+	$(RM) "$(SKEL_DIR)\inst\make_instance.py"
 	$(RMDIR) "$(BUILD_DIR)\lib\python\build"
+
+clean: rmlinks
 	$(RM) /s *.obj *.pyd *.pyc *.pyo