X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2c302df3a13236bfbf8ea1b771d13618fcda8d71..f3d4e0a47d33eb0c7061784b5705a9145740cd69:/make-dist

diff --git a/make-dist b/make-dist
index 7f7b01112a..1a92d48a6b 100755
--- a/make-dist
+++ b/make-dist
@@ -1,8 +1,7 @@
 #!/bin/sh
 ### make-dist: create an Emacs distribution tar file from current srcdir
 
-## Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-##   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+## Copyright (C) 1995, 1997-1998, 2000-2011  Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -147,7 +146,9 @@ then
 fi
 
 ### Find out which version of Emacs this is.
-version=`sed -n '/char emacs_version/ s/^[^"]*"\([^"]*\)".*$/\1/p' src/emacs.c`
+version=`
+  sed -n 's/^AC_INIT(emacs,[	 ]*\([^	 )]*\).*/\1/p' <configure.in
+` || version=
 if [ ! "${version}" ]; then
   echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
   exit 1
@@ -285,16 +286,20 @@ echo "Making links to top-level files"
 ln INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
 ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
-ln mkinstalldirs config.sub config.guess install-sh ${tempdir}
+ln config.sub config.guess install-sh ${tempdir}
+ln aclocal.m4 ${tempdir}
+ln compile depcomp missing ${tempdir}
+ln arg-nonnull.h c++defs.h warn-on-use.h ${tempdir}
 
 echo "Creating subdirectories"
 for subdir in site-lisp \
 	      leim leim/CXTERM-DIC leim/MISC-DIC \
 	      leim/SKK-DIC leim/ja-dic leim/quail \
-	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
+	      src src/m src/s src/bitmaps lib lib-src oldXMenu lwlib \
 	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
 	      `find etc lisp -type d` \
 	      doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
+	      test test/automated test/cedet test/cedet/tests test/indent \
 	      info m4 msdos \
 	      nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
 	      nextstep/Cocoa/Emacs.base/Contents \
@@ -354,7 +359,7 @@ echo "Making links to \`src'"
  ln makefile.w32-in ../${tempdir}/src
  ln .gdbinit .dbxinit ../${tempdir}/src
  cd ../${tempdir}/src
- rm -f config.h epaths.h Makefile buildobj.h)
+ rm -f globals.h config.h epaths.h Makefile buildobj.h)
 
 echo "Making links to \`src/bitmaps'"
 (cd src/bitmaps
@@ -368,14 +373,20 @@ echo "Making links to \`src/s'"
 (cd src/s
  ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
 
+echo "Making links to \`lib'"
+(build_aux_h=`(ls *.h)`
+ cd lib
+ ln [a-zA-Z]*.[ch] ../${tempdir}/lib
+ ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib
+ cd ../${tempdir}/lib
+ rm -f `(echo "$build_aux_h"; ls *.in.h) | sed '/[*]/d; s/.in.h$/.h/'`)
+
 echo "Making links to \`lib-src'"
 (cd lib-src
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
  ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src
- ln makefile.w32-in ../${tempdir}/lib-src
- cd ../${tempdir}/lib-src
- rm -f getopt.h)
+ ln makefile.w32-in ../${tempdir}/lib-src)
 
 echo "Making links to \`m4'"
 (cd m4
@@ -441,7 +452,7 @@ echo "Making links to \`lwlib'"
 echo "Making links to \`etc' and its subdirectories"
 for f in `find etc -type f`; do
   case $f in
-    etc/DOC*) continue ;;
+    etc/DOC*|etc/*.pyc) continue ;;
   esac
   ln $f $tempdir/$f
 done
@@ -474,10 +485,30 @@ echo "Making links to \`doc/man'"
  ln ChangeLog* *.1 ../../${tempdir}/doc/man
  cd ../../${tempdir}/doc/man)
 
+echo "Making links to \`test'"
+(cd test
+ ln *.el ChangeLog README ../${tempdir}/test)
+
+echo "Making links to \`test/automated'"
+(cd test/automated
+ ln *.el Makefile.in ../../${tempdir}/test/automated)
+
+echo "Making links to \`test/cedet'"
+(cd test/cedet
+ ln *.el ../../${tempdir}/test/cedet)
+
+echo "Making links to \`test/cedet/tests'"
+(cd test/cedet/tests
+ ln *.c *.[ch]pp *.el *.hh *.java *.make ../../../${tempdir}/test/cedet/tests)
+
+echo "Making links to \`test/indent'"
+(cd test/indent
+ ln *.m *.mod *.prolog Makefile ../../${tempdir}/test/indent)
+
 ### It would be nice if they could all be symlinks to top-level copy, but
 ### you're not supposed to have any symlinks in distribution tar files.
 echo "Making sure copying notices are all copies of \`COPYING'"
-for subdir in . etc info leim lib-src lisp lwlib msdos nt src; do
+for subdir in . etc info leim lib lib-src lisp lwlib msdos nt src; do
   rm -f ${tempdir}/${subdir}/COPYING
   cp COPYING ${tempdir}/${subdir}
 done