Standardize license wording, and switch license to GPLv3 or later.

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 80ff2d5e36b4d260be541df562f10d79046c84ba..155419ae567b5e0e3053c20c05b5ad067d64260b 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -6,8 +6,8 @@
 #### 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, 2002, 2005
-#   Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -120,8 +120,7 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
 fi
 
 ### Find where to run Emacs.
-### (We don't accept EMACS=t as an answer, since that probably only means
-### that the shell is running in an Emacs window.)
+### (Accept only absolute file names.)
 if [ $update = yes ];
 then
   unset EMACS_UNIBYTE
@@ -129,11 +128,15 @@ then
   then
     EMACS=`pwd`/src/emacs
   else
-    if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ];
-    then
-      echo You must specify the EMACS environment variable 2>&1
-      exit 1
-    fi
+    case $EMACS in
+      /*) ;;
+      *)
+       if [ ! -f "$EMACS" ]; then
+         echo "$0: You must specify the EMACS environment variable " \
+              "to an absolute file name." 2>&1
+         exit 1
+       fi;;
+    esac
   fi
 fi
 
@@ -290,7 +293,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 AUTHORS FTP INSTALL README BUGS move-if-change ${tempdir}
+ln AUTHORS FTP INSTALL README BUGS CONTRIBUTE 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.
@@ -315,11 +318,11 @@ for subdir in lisp site-lisp lispref lispintro \
              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 \
-             etc/images etc/images/ezimage etc/images/gnus \
-             etc/images/gud etc/images/mail etc/images/smilies \
-             etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \
-             info man m4 msdos vms mac mac/inc mac/inc/sys \
-             mac/src mac/Emacs.app mac/Emacs.app/Contents \
+             etc/images etc/images/ezimage etc/images/gnus etc/images/gud \
+             etc/images/icons etc/images/low-color etc/images/mail \
+             etc/images/smilies etc/tree-widget etc/tree-widget/default \
+             etc/tree-widget/folder info man 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
@@ -519,7 +522,7 @@ echo "Making links to \`nt/icons'"
 
 echo "Making links to \`mac'"
 (cd mac
- ln ChangeLog INSTALL README *.xml *.MPW ../${tempdir}/mac)
+ ln ChangeLog INSTALL README make-package *.xml *.MPW ../${tempdir}/mac)
 
 echo "Making links to \`mac/inc'"
 (cd mac/inc
@@ -537,6 +540,10 @@ 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'"
+(cd mac/Emacs.app/Contents/Resources
+ ln Emacs.icns ../../../../${tempdir}/mac/Emacs.app/Contents/Resources)
+
 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)
@@ -551,7 +558,7 @@ echo "Making links to \`msdos'"
 echo "Making links to \`oldXMenu'"
 (cd oldXMenu
  ln *.c *.h *.in ../${tempdir}/oldXMenu
- ln README Imakefile ChangeLog ../${tempdir}/oldXMenu
+ ln README ChangeLog ../${tempdir}/oldXMenu
  ln compile.com descrip.mms ../${tempdir}/oldXMenu)
 
 echo "Making links to \`lwlib'"
@@ -596,14 +603,14 @@ echo "Making links to \`etc/e'"
 
 echo "Making links to \`etc/images'"
 (cd etc/images
- for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
+ for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
    if [ -f $img ]; then
      ln $img ../../${tempdir}/etc/images
    fi
  done)
 
-for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/mail \
-           etc/images/smilies \
+for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \
+           etc/images/low-color etc/images/mail etc/images/smilies \
            etc/tree-widget/default etc/tree-widget/folder ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
@@ -625,6 +632,7 @@ echo "Making links to \`info'"
 echo "Making links to \`man'"
 (cd man
  ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
+ ln makefile.w32-in ../${tempdir}/man
  test -f README && ln README ../${tempdir}/man
  test -f Makefile.in && ln Makefile.in ../${tempdir}/man
  ln ChangeLog ../${tempdir}/man
@@ -639,6 +647,7 @@ echo "Making links to \`lispref'"
  ln `ls -1 *.texi` ../${tempdir}/lispref
  ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref
  ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref
+ ln makefile.w32-in ../${tempdir}/lispref
  test -f README && ln README ../${tempdir}/lispref
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref
  ln ChangeLog ../${tempdir}/lispref
@@ -649,6 +658,7 @@ echo "Making links to \`lispref'"
 echo "Making links to \`lispintro'"
 (cd lispintro
  ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro
+ ln makefile.w32-in ../${tempdir}/lispintro
  test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro
  test -f README && ln README ../${tempdir}/lispintro
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro