[Zope-Checkins] CVS: Zope/inst - configure.py:1.1.2.4

Chris McDonough chrism@zope.com
Mon, 26 Aug 2002 12:52:08 -0400


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

Modified Files:
      Tag: chrism-install-branch
	configure.py 
Log Message:
Make friendlier for non-GNU systems.


=== Zope/inst/configure.py 1.1.2.3 => 1.1.2.4 ===
--- Zope/inst/configure.py:1.1.2.3	Mon Aug 26 02:30:04 2002
+++ Zope/inst/configure.py	Mon Aug 26 12:52:08 2002
@@ -18,6 +18,7 @@
 """
 import getopt, sys, os
 
+BUILD_DIR     = os.path.abspath(os.path.split(os.path.dirname(sys.argv[0]))[0])
 ZOPE_HOME     = '/usr/local/zope'
 PYTHON        = sys.executable
 MAKEINSTANCE  = """#!/bin/sh
@@ -27,13 +28,13 @@
 MAKEFILE = """
 PYTHON=%(python)s
 ZOPE_HOME=%(zope_home)s
-BUILD_DIR=$(shell pwd)
-CPRU=/bin/cp -r -u
-MKDIR=/bin/mkdir -p
-RM=/bin/rm -rf
-FIND=/usr/bin/find
-TOUCH=/bin/touch
-XARGS=/usr/bin/xargs
+BUILD_DIR=%(build_dir)s
+CPRU=cp -R
+MKDIR=mkdir -p
+RM=rm -rf
+FIND=find
+TOUCH=touch
+XARGS=xargs
 
 .PHONY : clean install uninstall
 
@@ -66,6 +67,7 @@
 def main():
     REQUIRE_LF_ENABLED = 1
     zope_home = ZOPE_HOME
+    build_dir = BUILD_DIR
     python = PYTHON
     try:
         longopts = ["help", "ignore-largefile", "prefix="]
@@ -85,7 +87,7 @@
     if REQUIRE_LF_ENABLED:
         test_largefile()
     print "  - Zope top-level binary directory will be %s." % zope_home
-    opts = {'python':python,'zope_home':zope_home}
+    opts = {'python':python,'zope_home':zope_home,'build_dir':build_dir}
     mf = MAKEFILE % opts
     f = open('Makefile', 'w')
     f.write(mf)