X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e793672baa5f8ff7368889de16083d16ec661ce4..6f95b62114b75add0f2a976e6c872ec15b10c1ea:/make-dist?ds=sidebyside

diff --git a/make-dist b/make-dist
index 67fdddac22..cf5070f9c7 100755
--- a/make-dist
+++ b/make-dist
@@ -33,13 +33,18 @@ while [ $# -gt 0 ]; do
       clean_up=no
     ;;
     ## This option tells make-dist to make the distribution normally, then
-    ## remove all files newer than the given timestamp file.  This is useful
-    ## for creating incremental or patch distributions
+    ## remove all files older than the given timestamp file.  This is useful
+    ## for creating incremental or patch distributions.
     "--newer")
       newer="$2"
       new_extension=".new"
       shift
     ;;
+    ## This option tells make-dist to use `compress' instead of gzip.
+    ## Normally, make-dist uses gzip whenever it is present.
+    "--compress")
+      default_gzip="compress"
+    ;;
     * )
       echo "${progname}: Unrecognized argument: $1" >&2
       exit 1
@@ -95,7 +100,7 @@ mkdir ${tempdir}
 ### README while the rest of the tar file is still unpacking.  Whoopee.
 echo "Making links to top-level files." 
 ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir}
-ln ChangeLog Makefile.in build-install.in configure ${tempdir}
+ln ChangeLog Makefile.in build-install.in configure configure.in ${tempdir}
 ln make-dist ${tempdir}
 ### Copy config.sub; it's a cross-filesystem symlink.
 cp config.sub ${tempdir}
@@ -103,14 +108,14 @@ cp config.sub ${tempdir}
 echo "Creating subdirectories."
 # I think we're not going to distribute anything in external-lisp, so
 # I've removed it from this list.
-for subdir in lisp lisp/calc-2.02 lisp/term local-lisp \
-	      src src/m src/s lib-src oldXMenu \
+for subdir in lisp lisp/term local-lisp \
+	      src src/m src/s src/bitmaps lib-src oldXMenu \
 	      etc lock cpp info man shortnames vms; do
   mkdir ${tempdir}/${subdir}
 done
 
 echo "Making links to \`lisp'."
-### Don't distribute =*.el files, site-init.el, site-load.el, or default.el.
+### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el.
 (cd lisp
  ln [a-zA-Z]*.el ../${tempdir}/lisp
  ln [a-zA-Z]*.elc ../${tempdir}/lisp
@@ -118,42 +123,45 @@ echo "Making links to \`lisp'."
  ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
  ln ChangeLog README ../${tempdir}/lisp
  cd ../${tempdir}/lisp
+ rm -f TAGS =*
  rm -f site-init site-init.el site-init.elc
  rm -f site-load site-load.el site-load.elc
  rm -f default default.el default.elc)
 
-echo "Making links to \`lisp/calc-2.02'."
-### Don't distribute =*.el files or backups.
-(cd lisp/calc-2.02
- ln [a-zA-Z]*.el ../../${tempdir}/lisp/calc-2.02
- ln [a-zA-Z]*.elc ../../${tempdir}/lisp/calc-2.02
- ln calc.info* calc.texinfo calc-refcard.* ../../${tempdir}/lisp/calc-2.02
- ln INSTALL Makefile README README.prev ../../${tempdir}/lisp/calc-2.02
- cd ../../${tempdir}/lisp/calc-2.02
- rm -f *~)
+#echo "Making links to \`lisp/calc-2.02'."
+#### Don't distribute =*.el files, TAGS or backups.
+#(cd lisp/calc-2.02
+# ln [a-zA-Z]*.el ../../${tempdir}/lisp/calc-2.02
+# ln [a-zA-Z]*.elc ../../${tempdir}/lisp/calc-2.02
+# ln calc.info* calc.texinfo calc-refcard.* ../../${tempdir}/lisp/calc-2.02
+# ln INSTALL Makefile README README.prev ../../${tempdir}/lisp/calc-2.02
+# cd ../../${tempdir}/lisp/calc-2.02
+# rm -f *~ TAGS)
 
 echo "Making links to \`lisp/term'."
-### Don't distribute =*.el files.
+### Don't distribute =*.el files or TAGS.
 (cd lisp/term
  ln [a-zA-Z]*.el ../../${tempdir}/lisp/term
  ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term
- ln README ../../${tempdir}/lisp/term)
+ ln README ChangeLog ../../${tempdir}/lisp/term
+ rm -f =* TAGS)
 
 ### echo "Making links to \`external-lisp'."
-### ### Don't distribute =*.el files.
+### ### Don't distribute =*.el files or TAGS.
 ### (cd external-lisp
 ###  ln [a-zA-Z]*.el ../${tempdir}/external-lisp
 ###  ln [a-zA-Z]*.elc ../${tempdir}/external-lisp
-###  ln ChangeLog README ../${tempdir}/external-lisp)
+###  ln ChangeLog README ../${tempdir}/external-lisp
+###  rm -f =* TAGS)
 
 echo "Making links to \`src'."
 ### Don't distribute =*.[ch] files, or the configured versions of
-### config.h.in, paths.h.in, or Makefile.in.
+### config.h.in, paths.h.in, or Makefile.in, or TAGS.
 (cd src
  echo "  (If we can't link gmalloc.c, that's okay.)"
  ln [a-zA-Z]*.c ../${tempdir}/src
  ## Might be a symlink to a file on another filesystem.
- cp gmalloc.c ../${tempdir}/src
+ test -f ../${tempdir}/src/gmalloc.c || cp gmalloc.c ../${tempdir}/src
  ln [a-zA-Z]*.h ../${tempdir}/src
  ln [a-zA-Z]*.s ../${tempdir}/src
  ln README Makefile.in ymakefile ChangeLog config.h.in paths.h.in \
@@ -164,7 +172,12 @@ echo "Making links to \`src'."
  rm -f config.h paths.h Makefile
  if [ -z "${newer}" ]; then
    etags *.h *.c ../lisp/*.el
- fi)
+ fi
+ rm -f =* TAGS)
+
+echo "Making links to \`src/bitmaps'."
+(cd src/bitmaps
+ ln README *.xbm ../../${tempdir}/src/bitmaps)
 
 echo "Making links to \`src/m'."
 (cd src/m
@@ -178,40 +191,50 @@ echo "Making links to \`lib-src'."
 (cd lib-src
  ln [a-zA-Z]*.[chy] [a-zA-Z]*.lex [a-zA-Z]*.com ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README testfile vcdiff rcs2log ../${tempdir}/lib-src
- ln emacs.csh ../${tempdir}/lib-src
+ ln emacs.csh rcs-checkin ../${tempdir}/lib-src
  cd ../${tempdir}/lib-src
- rm -f getdate.c getdate.tab.c y.tab.c y.tab.h)
+ rm -f getdate.c getdate.tab.c y.tab.c y.tab.h
+ rm -f =* TAGS)
 
 echo "Making links to \`oldXMenu'."
 (cd oldXMenu
- ln *.c *.h ../${tempdir}/oldXMenu
- ln README Makefile Imakefile ChangeLog ../${tempdir}/oldXMenu)
+ ln *.c *.h *.in ../${tempdir}/oldXMenu
+ ln README Imakefile ChangeLog ../${tempdir}/oldXMenu
+ ln compile.com descrip.mms ../${tempdir}/oldXMenu)
 
 echo "Making links to \`etc'."
-### Don't distribute DOC files, backups, autosaves, or tex litter.
+### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
+### tex litter.
 (cd etc
- ln [0-9a-zA-Z]* ../${tempdir}/etc
+ ln `ls -d * | grep -v 'RCS' | grep -v 'Old'` ../${tempdir}/etc
  cd ../${tempdir}/etc
- rm -f DOC* *~ \#*\# *.dvi *.log *,v core)
+ rm -f DOC* *~ \#*\# *.dvi *.log *,v =* core
+ rm -f TAGS)
 
 echo "Making links to \`cpp'."
 (cd cpp
  ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
 
-###!! echo "Making links to \`info'."
-###!! # Don't distribute backups or autosaves.
-###!! (cd info
-###!!  ln [a-zA-Z]* ../${tempdir}/info
-###!!  cd ../${tempdir}/info
-###!!  # Avoid an error when expanding the wildcards later.
-###!!  ln emacs dummy~ ; ln emacs \#dummy\#
-###!!  rm -f *~ \#*\# core)
+echo "Making links to \`info'."
+# Don't distribute backups or autosaves.
+(cd info
+ ln [a-zA-Z]* ../${tempdir}/info
+ cd ../${tempdir}/info
+ # Avoid an error when expanding the wildcards later.
+ ln emacs dummy~ ; ln emacs \#dummy\#
+ rm -f *~ \#*\# core)
 
 echo "Making links to \`man'."
 (cd man
  ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
  ln *.c ../${tempdir}/man
- ln ChangeLog Makefile README split-man ../${tempdir}/man)
+ test -f README && ln README ../${tempdir}/man
+ test -f Makefile && ln Makefile ../${tempdir}/man
+ ln ChangeLog split-man ../${tempdir}/man
+ cp texinfo.tex texindex.c ../${tempdir}/man
+ cd ../${tempdir}/man
+ rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
+ rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
 
 echo "Making links to \`shortnames'."
 (cd shortnames
@@ -229,7 +252,9 @@ echo "Making links to \`vms'."
 echo "Making sure copying notices are all copies of \`etc/COPYING'."
 rm -f ${tempdir}/etc/COPYING
 cp etc/COPYING ${tempdir}/etc/COPYING
-for subdir in lisp external-lisp src lib-src info shortnames; do
+# I think we're not going to distribute anything in external-lisp, so
+# I've removed it from this list.
+for subdir in lisp src lib-src info shortnames; do
   if [ -f ${tempdir}/${subdir}/COPYING ]; then
     rm ${tempdir}/${subdir}/COPYING
   fi
@@ -245,8 +270,27 @@ if [ "${newer}" ]; then
 fi
 
 if [ "${make_tar}" = yes ]; then
+  if [ "${default_gzip}" = "" ]; then
+    echo "Looking for gzip."
+    temppath=`echo $PATH | sed 's/^:/.:/
+				s/::/:.:/g
+				s/:$/:./
+				s/:/ /g'`
+    default_gzip=`(
+      for dir in ${temppath}; do
+	if [ -f ${dir}/gzip ]; then echo 'gzip --best'; exit 0; fi
+      done
+      echo compress
+    )`
+  fi
+  case "${default_gzip}" in
+    compress* ) gzip_extension=.Z ;;
+    * )         gzip_extension=.z ;;
+  esac
   echo "Creating tar file."
-  (cd ${tempparent}; tar cvf - ${emacsname}) | compress > ${emacsname}.tar.Z
+  (cd ${tempparent} ; tar cvf - ${emacsname} ) \
+    | ${default_gzip} \
+    > ${emacsname}.tar${gzip_extension}
 fi
 
 if [ "${clean_up}" = yes ]; then