Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: [3.1.6-pws-3] fix use of DESTDIR in fns
- X-seq: zsh-workers 7703
- From: Clint Adams <schizo@xxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx
- Subject: PATCH: [3.1.6-pws-3] fix use of DESTDIR in fns
- Date: Tue, 7 Sep 1999 18:24:01 -0400
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
--- zsh-3.1.6.pws3.orig/Config/installfns.sh
+++ zsh-3.1.6.pws3/Config/installfns.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if test -d $fndir.old; then
+if test -d $DESTDIR$fndir.old; then
add_old=1
fi
@@ -22,27 +22,27 @@
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
subfile="$file"
subdir="`echo $file | sed -e 's%/[^/]*$%%'`"
- olddir="$fndir.old/$subdir"
- instdir="$fndir/$subdir"
+ olddir="$DESTDIR$fndir.old/$subdir"
+ instdir="$DESTDIR$fndir/$subdir"
else
subfile="`echo $file | sed -e 's%^.*/%%'`"
- olddir="$fndir.old"
- instdir="$fndir"
+ olddir="$DESTDIR$fndir.old"
+ instdir="$DESTDIR$fndir"
fi
- if test -f $fndir/$subfile; then
- if cmp $fndir/$subfile $sdir/$file >/dev/null; then :; else
+ if test -f $DESTDIR$fndir/$subfile; then
+ if cmp $DESTDIR$fndir/$subfile $sdir/$file >/dev/null; then :; else
$sdir_top/mkinstalldirs $olddir
- mv $fndir/$subfile $olddir
+ mv $DESTDIR$fndir/$subfile $olddir
: ${add_old:=1}
fi
fi
- $sdir_top/mkinstalldirs $DESTDIR$instdir || exit 1
- $INSTALL_DATA $sdir/$file $DESTDIR$instdir || exit 1
+ $sdir_top/mkinstalldirs $instdir || exit 1
+ $INSTALL_DATA $sdir/$file $instdir || exit 1
fi
done
if test x$add_old != x1; then
- rm -rf $fndir.old
+ rm -rf $DESTDIR$fndir.old
fi
exit 0
Messages sorted by:
Reverse Date,
Date,
Thread,
Author