summaryrefslogtreecommitdiff
path: root/make-dist
diff options
context:
space:
mode:
authorRomain Francoise <romain@orebokech.com>2007-11-23 18:06:58 +0000
committerRomain Francoise <romain@orebokech.com>2007-11-23 18:06:58 +0000
commit6b38f3492afb33f15e87cd7529dd6cd399f5e187 (patch)
treec24cd6db834e4682dac2fecba761bc4b1d2de601 /make-dist
parent63e2ed6e990b048f4aee850faa97cc25d889a166 (diff)
downloademacs-6b38f3492afb33f15e87cd7529dd6cd399f5e187.tar.gz
Include nXML. Don't try to copy FTP, it was removed on 2007/10/17.
Don't special-case alloca.c which is no longer in CVS.
Diffstat (limited to 'make-dist')
-rwxr-xr-xmake-dist30
1 files changed, 8 insertions, 22 deletions
diff --git a/make-dist b/make-dist
index 0703c51ab86..5cc2e090231 100755
--- a/make-dist
+++ b/make-dist
@@ -294,7 +294,7 @@ mkdir ${tempdir}
### tar file; this means that people can start reading the INSTALL and
### README while the rest of the tar file is still unpacking. Whoopee.
echo "Making links to top-level files"
-ln FTP INSTALL README BUGS move-if-change ${tempdir}
+ln INSTALL README BUGS move-if-change ${tempdir}
ln ChangeLog Makefile.in configure configure.in ${tempdir}
ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
### Copy these files; they're cross-filesystem symlinks.
@@ -324,9 +324,9 @@ for subdir in lisp site-lisp \
etc/images/smilies etc/images/smilies/grayscale \
etc/images/smilies/medium etc/images/tree-widget \
etc/images/tree-widget/default etc/images/tree-widget/folder \
- etc/refcards etc/tutorials info doc doc/emacs doc/misc doc/man \
- doc/lispref doc/lispintro m4 msdos vms mac mac/inc \
- mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \
+ etc/refcards etc/schema etc/tutorials info doc doc/emacs \
+ doc/misc doc/man doc/lispref doc/lispintro m4 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
@@ -374,7 +374,7 @@ echo "Making links to \`lisp' and its subdirectories"
for file in $subdirs; do
echo " lisp/$file"
- mkdir ../${tempdir}/lisp/$file
+ mkdir -p ../${tempdir}/lisp/$file
ln $file/[a-zA-Z0-9]*.el ../${tempdir}/lisp/$file
ln $file/[a-zA-Z0-9]*.elc ../${tempdir}/lisp/$file
for img in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.xbm $file/[a-zA-Z]*.pbm; do
@@ -575,7 +575,8 @@ echo "Making links to \`etc'"
### tex litter.
(cd etc
files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
- | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$'`
+ | grep -v '^images$' | grep -v '^refcards$' | grep -v '^tutorials$' \
+ | grep -v '^gnus$' | grep -v '^schema$'`
ln $files ../${tempdir}/etc
## If we ended up with a symlink, or if we did not get anything
## due to a cross-device symlink, copy the file.
@@ -598,7 +599,7 @@ echo "Making links to \`etc'"
rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
rm -f TAGS)
-for dir in etc/e etc/gnus etc/tutorials etc/refcards ; do
+for dir in etc/e etc/gnus etc/tutorials etc/refcards etc/schema ; do
echo "Making links to \`${dir}'"
(cd ${dir}
ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir}
@@ -709,21 +710,6 @@ for subdir in . etc info leim lib-src lisp lwlib mac msdos nt src; do
cp COPYING ${tempdir}/${subdir}
done
-#### Make sure that there aren't any hard links between files in the
-#### distribution; people with afs can't deal with that. Okay,
-#### actually we just re-copy anything with a link count greater
-#### than two. (Yes, strictly greater than 2 is correct; since we
-#### created these files by linking them in from the original tree,
-#### they'll have exactly two links normally.)
-####
-#### Commented out since it's not strictly necessary; it should suffice
-#### to just break the link on alloca.c.
-#echo "Breaking intra-tree links."
-#find ${tempdir} ! -type d -links +2 \
-# -exec cp -p {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
-rm -f $tempdir/lib-src/alloca.c
-cp $tempdir/src/alloca.c $tempdir/lib-src/alloca.c
-
if [ "${newer}" ]; then
echo "Removing files older than $newer"
## We remove .elc files unconditionally, on the theory that anyone picking