Merge from emacs--devo--0

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 1781746f75c1a526d09dba510e82a67bd61f18f6..534015b6ffa7669f5e9d87990d176ec0dae52cdd 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -317,7 +317,7 @@ 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 \
+             etc etc/charsets etc/e \
              etc/images etc/images/ezimage etc/images/gnus etc/images/gud \
              etc/images/icons etc/images/low-color etc/images/mail \
              etc/images/smilies etc/tree-widget etc/tree-widget/default \
@@ -572,7 +572,7 @@ echo "Making links to \`etc'"
 ### Don't distribute gfdl.1, since no man page references it.
 (cd etc
  files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
-        | grep -v '^images$' | grep -v '^tree-widget$'`
+        | grep -v '^charsets$' | grep -v '^images$' | grep -v '^tree-widget$'`
  ln $files ../${tempdir}/etc
  ## If we ended up with a symlink, or if we did not get anything
  ## due to a cross-device symlink, copy the file.
@@ -595,6 +595,12 @@ echo "Making links to \`etc'"
  rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
  rm -f TAGS)
 
+echo "Making links to \`etc/charsets'"
+(cd etc/charsets
+ ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/charsets
+ cd ../../${tempdir}/etc/charsets
+ rm -f *~ \#*\# *,v =* core)
+
 echo "Making links to \`etc/e'"
 (cd etc/e
  ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/e