Fix header line, copyright notice.

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index 86a78f8..bd7b19d 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -74,6 +74,28 @@ while [ $# -gt 0 ]; do
     "--compress")
       default_gzip="compress"
     ;;
+
+    "--snapshot")
+      clean_up=yes
+      make_tar=yes
+      update=no
+      check=no
+     ;;
+
+    "--help")
+      echo "Usage: ${progname} [options]"
+      echo ""
+      echo "  --clean-up       delete staging directories when done"
+      echo "  --compress       use compress instead of gzip"
+      echo "  --newer=TIME     don't include files older than TIME"
+      echo "  --no-check       don't check for bad file names etc."
+      echo "  --no-update      don't recompile or do analogous things"
+      echo "  --snapshot       same as --clean-up --no-update --tar --no-check"
+      echo "  --tar            make a tar file"
+      echo ""
+      exit 0
+    ;;
+
     * )
       echo "${progname}: Unrecognized argument: $1" >&2
       exit 1
@@ -175,7 +197,7 @@ then
   bogosities=
   for file in $losers; do
     file1=`echo $file | sed -e "s|.*/||"`
-    if ! sed -n -e "/^DONTCOMPILE/,/[^\\]\$/p" lisp/Makefile |
+    if ! sed -n -e "/^DONTCOMPILE/,/[^\\]\$/p" lisp/Makefile.in |
         grep -q "[     ]$file1\($\| \)"; then
       case $file in
        site-init.el | site-load.el | site-start.el | default.el)
@@ -260,13 +282,13 @@ 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 README BUGS move-if-change ${tempdir}
-ln ChangeLog Makefile.in configure configure.in ${tempdir}
+ln ChangeLog Makefile.in configure configure.in aclocal.m4 ${tempdir}
 ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
 ### Copy these files; they're cross-filesystem symlinks.
 cp mkinstalldirs ${tempdir}
 cp config.sub ${tempdir}
 cp config.guess ${tempdir}
-cp install.sh ${tempdir}
+cp install-sh ${tempdir}
 
 echo "Updating version number in README"
 (cd ${tempdir}
@@ -279,7 +301,7 @@ echo "Updating version number in README"
 
 echo "Creating subdirectories"
 for subdir in lisp site-lisp leim real-leim real-leim/CXTERM-DIC \
-             real-leim/SKK-DIC real-leim/skk real-leim/quail \
+             real-leim/SKK-DIC real-leim/ja-dic real-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; do
@@ -287,7 +309,7 @@ for subdir in lisp site-lisp leim real-leim real-leim/CXTERM-DIC \
 done
 
 echo "Initializing \`leim' subdirectory"
-cp leim/Makefile.in ${tempdir}/leim
+cp noleim-Makefile.in ${tempdir}/leim/Makefile.in
 
 echo "Making links to \`lisp' and its subdirectories"
 ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el.
@@ -295,9 +317,15 @@ echo "Making links to \`lisp' and its subdirectories"
  ln [a-zA-Z]*.el ../${tempdir}/lisp
  ln [a-zA-Z]*.elc ../${tempdir}/lisp
  ln [a-zA-Z]*.dat ../${tempdir}/lisp
+ for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
+   # If there are no images, the shell won't expand the pattern.
+   if [ -f $img ]; then
+     ln $img ../${tempdir}/lisp
+   fi
+ done
  ## simula.el doesn't keep abbreviations in simula.defns any more.
  ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
- ln ChangeLog Makefile makefile.nt ChangeLog.? ../${tempdir}/lisp
+ ln ChangeLog Makefile.in makefile.nt ChangeLog.? ../${tempdir}/lisp
  test -f README && ln README ../${tempdir}/lisp
  (cd ../${tempdir}/lisp
   rm -f TAGS =*
@@ -325,6 +353,11 @@ echo "Making links to \`lisp' and its subdirectories"
    mkdir ../${tempdir}/lisp/$file
    ln $file/[a-zA-Z]*.el ../${tempdir}/lisp/$file
    ln $file/[a-zA-Z]*.elc ../${tempdir}/lisp/$file
+   for img in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.xbm; do
+     if [ -f $img ]; then
+       ln $img ../${tempdir}/lisp/$file
+     fi
+   done
    if [ -f $file/README ]; then
      ln $file/README ../${tempdir}/lisp/$file
    fi
@@ -341,10 +374,9 @@ echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
 
  ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC
  ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC
- ln skk/*.el skk/*.elc ../${tempdir}/real-leim/skk
+ ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/real-leim/ja-dic
  ln quail/*.el quail/*.elc ../${tempdir}/real-leim/quail
-
- cp ../leim-Makefile.in ../${tempdir}/real-leim/Makefile.in
+ ln Makefile.in ../${tempdir}/real-leim/Makefile.in
 
  cd ../${tempdir}/real-leim
  rm -f TAGS =* */=*)
@@ -405,7 +437,7 @@ echo "Making links to \`lib-src'"
 (cd lib-src
  ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
- ln rcs2log rcs-checkin makefile.nt ../${tempdir}/lib-src
+ ln grep-changelog rcs2log rcs-checkin makefile.nt ../${tempdir}/lib-src
  ## If we ended up with a symlink, or if we did not get anything
  ## due to a cross-device symlink, copy the file.
  for file in [a-zA-Z]*.[chy]; do