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

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 0f23a0d3af16305dd5417f31afc5de5ed4ca6a2a..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, 2006
-#   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.
 #
@@ -522,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
@@ -540,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)
@@ -554,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'"
@@ -599,7 +603,7 @@ 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
@@ -628,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
@@ -642,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
@@ -652,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