X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/05494c29468aea12319e12b4917b4cc078e034f0..13abd69ff9c2407be2b5258f4ddcefff7af1b1a3:/make-dist

diff --git a/make-dist b/make-dist
index 1923f5dd55..8cfc41ccd2 100755
--- a/make-dist
+++ b/make-dist
@@ -6,7 +6,7 @@
 #### 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 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -129,7 +129,7 @@ then
     EMACS=`pwd`/src/emacs
   else
     if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ];
-    then 
+    then
       echo You must specify the EMACS environment variable 2>&1
       exit 1
     fi
@@ -150,7 +150,7 @@ echo Version numbers are $version and $shortversion
 
 if [ $update = yes ];
 then
-  if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
+  if grep -s "@set EMACSVER  *${shortversion}" ./man/emacs.texi > /dev/null; then
     true
   else
     echo "You must update the version number in \`./man/emacs.texi'"
@@ -231,18 +231,27 @@ then
 fi
 
 ### Make sure configure is newer than configure.in.
-if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
+if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then
   echo "\`./configure.in' is newer than \`./configure'" >&2
   echo "Running autoconf" >&2
   autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
 fi
 
+### Make sure src/config-in.stamp is newer than configure.in.
+if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then
+  echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2
+  echo "Running autoheader" >&2
+  autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; }
+  rm -f src/stamp-h.in
+  echo timestamp > src/stamp-h.in
+fi
+
 if [ $update = yes ];
 then
   echo "Updating Info files"
   (cd man; make -f Makefile.in srcdir=. info)
   (cd lispref; make -f Makefile.in srcdir=. info)
-  (cd lispintro; make -f Makefile.in srcdir=. info)
+  (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.)
 
   echo "Updating finder, custom and autoload data"
   (cd lisp; make updates EMACS="$EMACS")
@@ -268,7 +277,9 @@ echo "Making lisp/MANIFEST"
     files="$files $thisdir"
   fi
  done
- head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST)
+ for file in $files
+ do sed -n 's/^;;; //p; q' $file
+ done | sort > MANIFEST)
 
 echo "Creating staging directory: \`${tempparent}'"
 
@@ -313,8 +324,10 @@ for subdir in lisp site-lisp lispref lispintro \
 	      leim/SKK-DIC leim/ja-dic 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 mac mac/inc mac/inc/sys \
-	      mac/src
+	      etc etc/e info man 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
   echo "  ${tempdir}/${subdir}"
   mkdir ${tempdir}/${subdir}
@@ -349,7 +362,7 @@ echo "Making links to \`lisp' and its subdirectories"
  for file in `find . -type d -print`; do
    case $file in
      . | .. | */Old | */CVS | */RCS | */=*)
-       ;;	
+       ;;
      *)
        if [ -d $file ]; then
 	 subdirs="$file $subdirs"
@@ -393,6 +406,7 @@ echo "Making links to \`leim' and its subdirectories"
  ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
  ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic
  ln Makefile.in ../${tempdir}/leim/Makefile.in
+ ln leim-ext.el ../${tempdir}/leim/leim-ext.el
  ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail
  rm -f ../${tempdir}/leim/quail/quick-b5.*
  rm -f ../${tempdir}/leim/quail/quick-cns.*
@@ -499,7 +513,8 @@ echo "Making links to \`nt/inc/netinet'"
 
 echo "Making links to \`nt/icons'"
 (cd nt/icons
- ln [a-z]*.ico ../../${tempdir}/nt/icons)
+ ln [a-z]*.ico ../../${tempdir}/nt/icons
+ ln [a-z]*.cur ../../${tempdir}/nt/icons)
 
 echo "Making links to \`mac'"
 (cd mac
@@ -517,6 +532,14 @@ echo "Making links to \`mac/src'"
 (cd mac/src
  ln [a-z]*.c *.r ../../${tempdir}/mac/src)
 
+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/English.lproj'"
+(cd mac/Emacs.app/Contents/Resources/English.lproj
+ ln InfoPlist.strings ../../../../../${tempdir}/mac/Emacs.app/Contents/Resources/English.lproj)
+
 echo "Making links to \`msdos'"
 (cd msdos
  ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
@@ -533,9 +556,7 @@ echo "Making links to \`oldXMenu'"
 echo "Making links to \`lwlib'"
 (cd lwlib
  ln *.c *.h *.in ../${tempdir}/lwlib
- ln README Imakefile ChangeLog ../${tempdir}/lwlib
- cd ../${tempdir}/lwlib
- rm -f lwlib-Xol*)
+ ln README ChangeLog ../${tempdir}/lwlib)
 
 echo "Making links to \`etc'"
 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
@@ -595,8 +616,9 @@ echo "Making links to \`man'"
 
 echo "Making links to \`lispref'"
 (cd lispref
- ln *.texi *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref
- ln *.txt *.el spellfile permute-index tindex.pl ../${tempdir}/lispref
+ ln `ls -1 *.texi` ../${tempdir}/lispref
+ ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref
+ ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref
  test -f README && ln README ../${tempdir}/lispref
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref
  ln ChangeLog ../${tempdir}/lispref
@@ -684,4 +706,5 @@ else
   rm -rf ${tempparent}
 fi
 
+# arch-tag: 26e3eb50-a394-4ab2-82b2-d8e5af500de7
 ### make-dist ends here