Commit 4ed15f9d by Richard Stallman

(PWDCMD): New variable, set specially for Apollos.

Use it to get the working dir.

From-SVN: r2808
parent d038420e
...@@ -26,6 +26,16 @@ export TERM ...@@ -26,6 +26,16 @@ export TERM
EXINIT=set EXINIT=set
export EXINIT export EXINIT
# Define PWDCMD as a command to use to get the working dir
# in the form that we want.
PWDCMD=pwd
case "`pwd`" in
//*)
# On an Apollo, discard everything before `/usr'.
PWDCMD="(pwd) | sed -e 's,.*/usr/,/usr/,'"
;;
esac
# Directory in which to store the results. # Directory in which to store the results.
LIB=${1?"fixincludes: output directory not specified"} LIB=${1?"fixincludes: output directory not specified"}
...@@ -35,7 +45,7 @@ if [ ! -d $LIB ]; then ...@@ -35,7 +45,7 @@ if [ ! -d $LIB ]; then
fi fi
# Make LIB absolute. # Make LIB absolute.
cd $LIB; LIB=`pwd` cd $LIB; LIB=`${PWDCMD}`
# Fail if no arg to specify a directory for the output. # Fail if no arg to specify a directory for the output.
if [ x$1 = x ] if [ x$1 = x ]
...@@ -123,7 +133,7 @@ if $LINKS; then ...@@ -123,7 +133,7 @@ if $LINKS; then
for file in $files; do for file in $files; do
dest=`ls -ld $file | sed -n 's/.*-> //p'` dest=`ls -ld $file | sed -n 's/.*-> //p'`
if [ "$dest" ]; then if [ "$dest" ]; then
cwd=`pwd` cwd=`${PWDCMD}`
# In case $dest is relative, get to $file's dir first. # In case $dest is relative, get to $file's dir first.
cd ${INPUT} cd ${INPUT}
cd `echo ./$file | sed -n 's&[^/]*$&&p'` cd `echo ./$file | sed -n 's&[^/]*$&&p'`
...@@ -133,7 +143,7 @@ if $LINKS; then ...@@ -133,7 +143,7 @@ if $LINKS; then
if [ $? = 0 ]; then if [ $? = 0 ]; then
cd $dest cd $dest
# X gets the dir that the link actually leads to. # X gets the dir that the link actually leads to.
x=`pwd` x=`${PWDCMD}`
# If a link points to ., make a similar link to . # If a link points to ., make a similar link to .
if [ $x = $INPUT ]; then if [ $x = $INPUT ]; then
echo $file '->' . ': Making link' echo $file '->' . ': Making link'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment