#### be distributed. This means that if you add a file with an odd name,
#### you should make sure that this script will include it.
-# Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
if [ $update = yes ];
then
- if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
+ if grep -s "@set EMACSVER *${shortversion}" ./man/emacs.texi > /dev/null; then
true
else
echo "You must update the version number in \`./man/emacs.texi'"
fi
### Make sure configure is newer than configure.in.
-if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
+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/config-in.stamp 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 man; make -f Makefile.in srcdir=. info)
(cd lispref; make -f Makefile.in srcdir=. info)
- (cd lispintro; make -f Makefile.in srcdir=. info)
+ (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.)
echo "Updating finder, custom and autoload data"
(cd lisp; make updates EMACS="$EMACS")
files="$files $thisdir"
fi
done
- head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST)
+ for file in $files
+ do sed -n 's/^;;; //p; q' $file
+ done | sort > MANIFEST)
echo "Creating staging directory: \`${tempparent}'"
echo "Creating subdirectories"
for subdir in lisp site-lisp lispref lispintro \
- leim leim leim/CXTERM-DIC leim/MISC-DIC \
+ leim leim/CXTERM-DIC leim/MISC-DIC \
leim/SKK-DIC leim/ja-dic leim/quail \
src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
- etc etc/e lock info man msdos vms mac mac/inc mac/inc/sys \
- mac/src
+ etc etc/e info man msdos vms mac mac/inc mac/inc/sys \
+ mac/src mac/Emacs.app mac/Emacs.app/Contents \
+ mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
+ mac/Emacs.app/Contents/Resources/English.lproj
do
echo " ${tempdir}/${subdir}"
mkdir ${tempdir}/${subdir}
(cd mac/src
ln [a-z]*.c *.r ../../${tempdir}/mac/src)
+echo "Making links to \`mac/Emacs.app/Contents'"
+(cd mac/Emacs.app/Contents
+ ln Info.plist PkgInfo ../../../${tempdir}/mac/Emacs.app/Contents)
+
+echo "Making links to \`mac/Emacs.app/Contents/Resources/English.lproj'"
+(cd mac/Emacs.app/Contents/Resources/English.lproj
+ ln InfoPlist.strings ../../../../../${tempdir}/mac/Emacs.app/Contents/Resources/English.lproj)
+
echo "Making links to \`msdos'"
(cd msdos
ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
echo "Making links to \`lwlib'"
(cd lwlib
ln *.c *.h *.in ../${tempdir}/lwlib
- ln README Imakefile ChangeLog ../${tempdir}/lwlib
- cd ../${tempdir}/lwlib
- rm -f lwlib-Xol*)
+ ln README ChangeLog ../${tempdir}/lwlib)
echo "Making links to \`etc'"
### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
echo "Making links to \`lispref'"
(cd lispref
- ln *.texi *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref
+ ln `ls -1 *.texi | grep -v index.texi` ../${tempdir}/lispref
+ ln *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref
ln *.txt *.el spellfile permute-index tindex.pl ../${tempdir}/lispref
test -f README && ln README ../${tempdir}/lispref
test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref