Merge from trunk.

1 files changed, 6 insertions, 1 deletions

diff --git a/make-dist b/make-dist
index 980807e7743..c15fecfd111 100755
--- a/make-dist
+++ b/make-dist
@@ -295,7 +295,7 @@ for subdir in site-lisp \
               build-aux build-aux/snippet \
               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` \
+              `find etc lisp admin -type d` \
               doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
               info m4 msdos \
               nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
@@ -456,6 +456,11 @@ echo "Making links to \`lwlib'"
  ln *.[ch] *.in ../${tempdir}/lwlib
  ln README ChangeLog ../${tempdir}/lwlib)
 
+echo "Making links to \`admin' and its subdirectories"
+for f in `find admin -type f`; do
+  ln $f $tempdir/$f
+done
+
 echo "Making links to \`etc' and its subdirectories"
 for f in `find etc -type f`; do
   case $f in