Commit f3dd02ea authored by Glenn Morris's avatar Glenn Morris
Browse files

* make-dist: Avoid listing .el files twice.

Don't try to run autoconf if --no-update.
parent 7c23d9e8
2010-10-22 Glenn Morris <rgm@gnu.org>
* make-dist: Avoid listing .el files twice. Don't try to run
autoconf if --no-update.
2010-10-20 Glenn Morris <rgm@gnu.org>
* make-dist: No longer create lisp/MANIFEST.
......
......@@ -186,72 +186,66 @@ them, and try again." >&2
exit 1
fi
### Find where to run Emacs.
if [ $check = yes ];
then
### Check for .elc files with no corresponding .el file.
if [ $check = yes ]; then
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el
leim/[a-z]*/[a-z]*.el > /tmp/el
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
leim/[a-z]*/[a-z]*.elc > /tmp/elc
bogosities="`comm -13 /tmp/el /tmp/elc`"
if [ "${bogosities}" != "" ]; then
## Check for .elc files with no corresponding .el file.
sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc
bogosities="`comm -13 /tmp/elelc /tmp/elc`"
if [ x"${bogosities}" != x"" ]; then
echo "The following .elc files have no corresponding .el files:"
echo "${bogosities}"
fi
rm -f /tmp/el /tmp/elc
### Check for .el files with no corresponding .elc file.
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.el > /tmp/el
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.elc | sed 's/\.elc$/.el/' > /tmp/elc
losers="`comm -23 /tmp/el /tmp/elc`"
sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel
losers="`comm -23 /tmp/el /tmp/elcel`"
rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc
bogosities=
for file in $losers; do
if ! grep -q "no-byte-compile: t" $file; then
case $file in
site-init.el | site-load.el | site-start.el | default.el)
;;
*)
bogosities="$file $bogosities"
;;
esac
fi
grep -q "no-byte-compile: t" $file && continue
case $file in
site-init.el | site-load.el | site-start.el | default.el) continue ;;
esac
bogosities="$file $bogosities"
done
if [ x"${bogosities}" != x"" ]; then
echo "The following .el files have no corresponding .elc files:"
echo "${bogosities}"
fi
rm -f /tmp/el /tmp/elc
fi
### Make sure configure is newer than configure.in.
if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then
echo "\`./configure.in' is newer than \`./configure'" >&2
echo "Running autoconf" >&2
autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
fi
if [ $update = yes ]; then
### Make sure src/stamp-h.in is newer than configure.in.
if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then
echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2
echo "Running autoheader" >&2
autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; }
rm -f src/stamp-h.in
echo timestamp > src/stamp-h.in
fi
## Make sure configure is newer than configure.in.
if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then
echo "\`./configure.in' is newer than \`./configure'" >&2
echo "Running autoconf" >&2
autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
fi
## Make sure src/stamp-h.in is newer than configure.in.
if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then
echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2
echo "Running autoheader" >&2
autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; }
rm -f src/stamp-h.in
echo timestamp > src/stamp-h.in
fi
if [ $update = yes ];
then
echo "Updating Info files"
(cd doc/emacs; make info)
(cd doc/misc; make info)
......@@ -268,7 +262,7 @@ then
echo "Recompiling Lisp files"
$EMACS -batch -f batch-byte-recompile-directory lisp leim
fi
fi # $update = yes
echo "Creating staging directory: \`${tempparent}'"
......
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