Fix shr.el/image build problem

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 50662a4f2c4f785264d7e6eb0e1a265699111bc5..c0b0a0466f28e1c191fbd77de78e565ee4df4c47 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -284,7 +284,7 @@ echo "Creating top directory: '${tempdir}'"
 mkdir ${tempdir}
 
 if [ "$changelog" = yes ]; then
-  if test -d .git; then
+  if test -e .git; then
     echo "Making top-level ChangeLog"
     make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \
       { x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; }
@@ -301,7 +301,7 @@ echo "Making links to top-level files"
 ln INSTALL README BUGS ${tempdir}
 ln ChangeLog.*[0-9] Makefile.in autogen.sh configure configure.ac ${tempdir}
 ln config.bat make-dist .dir-locals.el ${tempdir}
-ln aclocal.m4 ${tempdir}
+ln aclocal.m4 CONTRIBUTE ${tempdir}
 
 echo "Creating subdirectories"
 for subdir in site-lisp \
@@ -311,7 +311,7 @@ for subdir in site-lisp \
              nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
              `find etc lisp admin test -type d` \
              doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
-             info m4 msdos \
+             info m4 modules modules/mod-test msdos \
              nextstep nextstep/templates \
              nextstep/Cocoa nextstep/Cocoa/Emacs.base \
              nextstep/Cocoa/Emacs.base/Contents \
@@ -323,7 +323,7 @@ do
 
   if [ "$with_tests" != "yes" ]; then
     case $subdir in
-        test*) continue ;;
+        test*|*/mod-test*) continue ;;
     esac
   fi
 
@@ -362,7 +362,7 @@ echo "Making links to 'build-aux'"
  ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux
  ln install-sh missing move-if-change ../${tempdir}/build-aux
  ln update-copyright update-subdirs ../${tempdir}/build-aux
- ln dir_top make-info-dir ../${tempdir}/build-aux)
+ ln dir_top make-info-dir ar-lib ../${tempdir}/build-aux)
 
 echo "Making links to 'build-aux/snippet'"
 (cd build-aux/snippet
@@ -405,12 +405,25 @@ echo "Making links to 'm4'"
 (cd m4
  ln *.m4 ../${tempdir}/m4)
 
+echo "Making links to 'modules'"
+(cd modules
+ ln *.py ../${tempdir}/modules
+ if [ "$with_tests" = "yes" ]; then
+   for f in `find mod-test -type f`; do
+       case $f in
+           *.log|*.o|*.so) continue ;;
+       esac
+       ln $f ../$tempdir/modules/$f
+   done
+ fi
+)
+
 echo "Making links to 'nt'"
 (cd nt
  ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt
- ln subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
+ ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
  ln *.in gnulib.mk ../${tempdir}/nt
- ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt
+ ln mingw-cfg.site epaths.nt INSTALL.W64 ../${tempdir}/nt
  ln ChangeLog.*[0-9] INSTALL README README.W32 ../${tempdir}/nt)
 
 echo "Making links to 'nt/inc' and its subdirectories"