Changeset 13425

Timestamp:

Feb 2, 2010, 12:58:40 AM (11 years ago)

Author:

rme

Message:

Port r13416 (cygwin botch in ccl/ccl64 scripts) from trunk
to 1.4 branch.

See ticket:655.

Location:

release/1.4/source/scripts

Files:

• . (modified) (1 prop)
• ccl (modified) (3 diffs)
• ccl64 (modified) (3 diffs)

release/1.4/source/scripts/ccl

@@ -1 +1 @@
 #!/bin/sh
-#
+
 # Change the definition of CCL_DEFAULT_DIRECTORY below to refer to
-# your OpenMCL installation directory.  
-# Any definition of CCL_DEFAULT_DIRECTORY already present in the environment 
-# takes precedence over definitions made below.
+# your Clozure CL installation directory.  The lisp will use this
+# environment variable to set up translations for the CCL: logical
+# host.
+
+# Any definition of CCL_DEFAULT_DIRECTORY already present in the
+# environment takes precedence over definition made below.
 
 if [ -z "$CCL_DEFAULT_DIRECTORY" ]; then
@@ -10 +13 @@
 fi
 
-export CCL_DEFAULT_DIRECTORY
-
-# This is shorter (& easier to type), making the invocation below
-# a little easier to read.
-
-DD=${CCL_DEFAULT_DIRECTORY}
-
-# If you don't want to guess the name of the OpenMCL kernel on
+# If you don't want to guess the name of the lisp kernel on
 # every invocation (or if you want to use a kernel with a
 # non-default name), you might want to uncomment and change
 # the following line:
 #OPENMCL_KERNEL=some_name
-
-# Set the CCL_DEFAULT_DIRECTORY  environment variable; 
-# the lisp will use this to setup translations for the CCL: logical host.
 
 if [ -z "$OPENMCL_KERNEL" ]; then
@@ -51 +44 @@
 fi
 
-exec ${DD}/${OPENMCL_KERNEL} "$@"
+export CCL_DEFAULT_DIRECTORY
+exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} "$@"
 

release/1.4/source/scripts/ccl64

@@ -2 +2 @@
 #
 # Change the definition of CCL_DEFAULT_DIRECTORY below to refer to
-# your OpenMCL installation directory.  
-# Any definition of CCL_DEFAULT_DIRECTORY already present in the environment 
-# takes precedence over definitions made below.
+# your Clozure CL installation directory.  The lisp will use this
+# environment variable to set up translations for the CCL: logical
+# host.
+
+# Any definition of CCL_DEFAULT_DIRECTORY already present in the
+# environment takes precedence over definition made below.
 
 if [ -z "$CCL_DEFAULT_DIRECTORY" ]; then
   CCL_DEFAULT_DIRECTORY=/usr/local/src/ccl
 fi
-
-# This is shorter (& easier to type), making the invocation below
-# a little easier to read.
-
-DD=${CCL_DEFAULT_DIRECTORY}
 
 # If you don't want to guess the name of the OpenMCL kernel on
@@ -20 +18 @@
 # the following line:
 #OPENMCL_KERNEL=some_name
-
-# Set the CCL_DEFAULT_DIRECTORY  environment variable; 
-# the lisp will use this to setup translations for the CCL: logical host.
 
 if [ -z "$OPENMCL_KERNEL" ]; then
@@ -83 +78 @@
 fi
 
-CCL_DEFAULT_DIRECTORY=${DD} exec ${DD}/${OPENMCL_KERNEL} "$@"
+export CCL_DEFAULT_DIRECTORY
+exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} "$@"