Mercurial > emacs
diff make-dist @ 112335:d3c691ea0839
Merge: Automate syncing from gnulib.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 12:17:27 -0800 (2011-01-17) |
parents | ba9f26694b92 |
children |
line wrap: on
line diff
--- a/make-dist Sun Jan 16 23:46:36 2011 -0800 +++ b/make-dist Mon Jan 17 12:17:27 2011 -0800 @@ -286,12 +286,15 @@ 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 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 \ @@ -369,14 +372,20 @@ (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 @@ -498,7 +507,7 @@ ### 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