comparison make-dist @ 90601:a1a25ac6c88a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 427-436) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 134-136) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
author Miles Bader <miles@gnu.org>
date Thu, 14 Sep 2006 09:24:00 +0000
parents 138ce2701550 81a55a7dc3c3
children 7eeafaaa9eab
comparison
equal deleted inserted replaced
90600:84dd84b43e1b 90601:a1a25ac6c88a
118 echo "distribution tree. cd to that directory and try again." >&2 118 echo "distribution tree. cd to that directory and try again." >&2
119 exit 1 119 exit 1
120 fi 120 fi
121 121
122 ### Find where to run Emacs. 122 ### Find where to run Emacs.
123 ### (We don't accept EMACS=t as an answer, since that probably only means 123 ### (Accept only absolute file names.)
124 ### that the shell is running in an Emacs window.)
125 if [ $update = yes ]; 124 if [ $update = yes ];
126 then 125 then
127 unset EMACS_UNIBYTE 126 unset EMACS_UNIBYTE
128 if [ -f src/emacs ]; 127 if [ -f src/emacs ];
129 then 128 then
130 EMACS=`pwd`/src/emacs 129 EMACS=`pwd`/src/emacs
131 else 130 else
132 if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ]; 131 case $EMACS in
133 then 132 /*) ;;
134 echo You must specify the EMACS environment variable 2>&1 133 *)
135 exit 1 134 if [ ! -f "$EMACS" ]; then
136 fi 135 echo "$0: You must specify the EMACS environment variable " \
136 "to an absolute file name." 2>&1
137 exit 1
138 fi;;
139 esac
137 fi 140 fi
138 fi 141 fi
139 142
140 ### Find out which version of Emacs this is. 143 ### Find out which version of Emacs this is.
141 shortversion=`grep 'defconst[ ]*emacs-version' lisp/version.el \ 144 shortversion=`grep 'defconst[ ]*emacs-version' lisp/version.el \