Commit bb160193 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

When breaking links, use cp -p.

Copy install.sh into distribution.
Move the temp dir up into the parent dir;
don't leave the staging dir make-dist.tmp... in existence.
parent cabfafdc
...@@ -76,6 +76,16 @@ else ...@@ -76,6 +76,16 @@ else
sleep 5 sleep 5
fi fi
### Make sure we don't already have a directory emacs-${version}.
emacsname="emacs-${version}${new_extension}"
if [ -d ${emacsname} ]
then
echo Directory "${emacsname}" already exists >&2
exit 1
fi
### Make sure the subdirectory is available. ### Make sure the subdirectory is available.
tempparent="make-dist.tmp.$$" tempparent="make-dist.tmp.$$"
if [ -d ${tempparent} ]; then if [ -d ${tempparent} ]; then
...@@ -108,8 +118,8 @@ fi ...@@ -108,8 +118,8 @@ fi
(cd lib-src; make -f Makefile.in getdate.c YACC="bison -y") (cd lib-src; make -f Makefile.in getdate.c YACC="bison -y")
echo "Creating staging directory: \`${tempparent}'" echo "Creating staging directory: \`${tempparent}'"
mkdir ${tempparent} mkdir ${tempparent}
emacsname="emacs-${version}${new_extension}"
tempdir="${tempparent}/${emacsname}" tempdir="${tempparent}/${emacsname}"
### This trap ensures that the staging directory will be cleaned up even ### This trap ensures that the staging directory will be cleaned up even
...@@ -129,9 +139,10 @@ echo "Making links to top-level files." ...@@ -129,9 +139,10 @@ echo "Making links to top-level files."
ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir} ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir}
ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir} ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir}
ln make-dist vpath.sed ${tempdir} ln make-dist vpath.sed ${tempdir}
### Copy config.guess and config.sub; they're cross-filesystem symlinks. ### Copy these files; they're cross-filesystem symlinks.
cp config.sub ${tempdir} cp config.sub ${tempdir}
cp config.guess ${tempdir} cp config.guess ${tempdir}
cp install.sh ${tempdir}
echo "Updating version number in README." echo "Updating version number in README."
(cd ${tempdir} (cd ${tempdir}
...@@ -338,6 +349,9 @@ fi ...@@ -338,6 +349,9 @@ fi
if [ "${clean_up}" = yes ]; then if [ "${clean_up}" = yes ]; then
echo "Cleaning up the staging directory." echo "Cleaning up the staging directory."
rm -rf ${tempparent} rm -rf ${tempparent}
else
(cd ${tempparent}; mv ${emacsname} ..)
rm -rf ${tempparent}
fi fi
### make-dist ends here ### make-dist ends here
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