[Zope-Checkins] CVS: Zope - Makefile.in:1.1.2.5 configure:1.1.2.5

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	Makefile.in configure 
Log Message:
Fixes:

- workaround Solaris' crufty old 'install'

- correct thinko wrt zope script location



=== Zope/Makefile.in 1.1.2.4 => 1.1.2.5 ===
 	install -d -m 755 ${DESTDIR}${BINDIR}
 	if test \! -f ${ZOPE} ; then \
-		install -C -m 755 ZopeControl/zope ${DESTDIR}${BINDIR} ; \
+		cp ZopeControl/zope ${DESTDIR}${BINDIR}/ ; \
+		chmod 755 ${DESTDIR}${BINDIR}/zope ; \
 	fi
 	if test `${PYTHON} ZopeControl/zope revision` -ge \
 		`${ZOPE} revision` ; then \
-		install -C -m 755 ZopeControl/zope ${DESTDIR}${BINDIR} ; \
+		cp ZopeControl/zope ${DESTDIR}${BINDIR}/ ; \
+		chmod 755 ${DESTDIR}${BINDIR}/zope ; \
 	fi
 
 register:


=== Zope/configure 1.1.2.4 => 1.1.2.5 ===
 	$ZOPE config
 	eval `$ZOPE config`
+        zope_filled=1
+    else
+        echo Found $ZOPE, but it is not executable.  Will install a new one.
+        zope_filled=0
     fi
 else
     echo Could not find a zope control utility in your PATH.  Will install
-    echo one as $BINDIR/zope.
-    ZOPE=$BINDIR/zope
+    echo a new one.
+    zope_filled=0
 fi
 echo
 
@@ -137,6 +141,11 @@
 	    ;;
     esac
 done
+
+# Now that we've had a chance to accept overrides, fill in the ZOPE variable.
+if test x$zope_filled = x0; then
+    ZOPE=$BINDIR/zope
+fi
 
 # Search for an acceptable Python binary.
 if test x$OVERRIDE_PYTHON = x; then