|
|
60a801 |
Index: Build.sh
|
|
|
60a801 |
===================================================================
|
|
|
60a801 |
RCS file: /cvs/src/bin/mksh/Build.sh,v
|
|
|
60a801 |
retrieving revision 1.630
|
|
|
60a801 |
retrieving revision 1.631
|
|
|
60a801 |
diff -u -p -r1.630 -r1.631
|
|
|
60a801 |
--- Build.sh 2 May 2013 21:59:44 -0000 1.630
|
|
|
60a801 |
+++ Build.sh 5 May 2013 13:38:00 -0000 1.631
|
|
|
60a801 |
@@ -63,7 +63,7 @@ vq() {
|
|
|
60a801 |
rmf() {
|
|
|
60a801 |
for _f in "$@"; do
|
|
|
60a801 |
case $_f in
|
|
|
60a801 |
- Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;;
|
|
|
60a801 |
+ Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|lksh.1|mksh.1) ;;
|
|
|
60a801 |
*) rm -f "$_f" ;;
|
|
|
60a801 |
esac
|
|
|
60a801 |
done
|
|
|
60a801 |
@@ -458,7 +458,7 @@ oswarn=
|
|
|
60a801 |
ccpc=-Wc,
|
|
|
60a801 |
ccpl=-Wl,
|
|
|
60a801 |
tsts=
|
|
|
60a801 |
-ccpr='|| for _f in ${tcfn}*; do case $_f in Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;; *) rm -f "$_f" ;; esac; done'
|
|
|
60a801 |
+ccpr='|| for _f in ${tcfn}*; do case $_f in Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|lksh.1|mksh.1) ;; *) rm -f "$_f" ;; esac; done'
|
|
|
60a801 |
|
|
|
60a801 |
# Evil hack
|
|
|
60a801 |
if test x"$TARGET_OS" = x"Android"; then
|
|
|
60a801 |
@@ -2268,8 +2268,10 @@ test 1 = $eq && e=:
|
|
|
60a801 |
$e
|
|
|
60a801 |
$e Installing the shell:
|
|
|
60a801 |
$e "# $i -c -s -o root -g bin -m 555 $tfn /bin/$tfn"
|
|
|
60a801 |
-$e "# grep -x /bin/$tfn /etc/shells >/dev/null || echo /bin/$tfn >>/etc/shells"
|
|
|
60a801 |
-$e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
|
|
|
60a801 |
+if test $legacy = 0; then
|
|
|
60a801 |
+ $e "# grep -x /bin/$tfn /etc/shells >/dev/null || echo /bin/$tfn >>/etc/shells"
|
|
|
60a801 |
+ $e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
|
|
|
60a801 |
+fi
|
|
|
60a801 |
$e
|
|
|
60a801 |
$e Installing the manual:
|
|
|
60a801 |
if test -f $tfn.cat1; then
|
|
|
60a801 |
@@ -2277,7 +2279,7 @@ if test -f $tfn.cat1; then
|
|
|
60a801 |
"/usr/share/man/cat1/$tfn.0"
|
|
|
60a801 |
$e or
|
|
|
60a801 |
fi
|
|
|
60a801 |
-$e "# $i -c -o root -g bin -m 444 mksh.1 /usr/share/man/man1/$tfn.1"
|
|
|
60a801 |
+$e "# $i -c -o root -g bin -m 444 $tfn.1 /usr/share/man/man1/$tfn.1"
|
|
|
60a801 |
$e
|
|
|
60a801 |
$e Run the regression test suite: ./test.sh
|
|
|
60a801 |
$e Please also read the sample file dot.mkshrc and the fine manual.
|
|
|
60a801 |
|