Make Leim part of the standard tarball:

Don't copy noleim-Makefile.in to the leim subdirectory.
Link Leim files to ${tempdir}/leim, not to real-leim.  Don't move
Leim files out of the Emacs tree.  Don't prepare a separate tarball
for Leim.

1 files changed, 20 insertions, 32 deletions

diff --git a/make-dist b/make-dist
index a23c30b043f..192fcc6f073 100755
--- a/make-dist
+++ b/make-dist
@@ -309,8 +309,8 @@ echo "Updating version number in README"
 
 echo "Creating subdirectories"
 for subdir in lisp site-lisp lispref lispintro \
-	      leim real-leim real-leim/CXTERM-DIC real-leim/MISC-DIC \
-	      real-leim/SKK-DIC real-leim/ja-dic real-leim/quail \
+	      leim 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 \
 	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
 	      etc etc/e lock info man msdos vms mac mac/inc mac/inc/sys \
@@ -320,9 +320,6 @@ do
   mkdir ${tempdir}/${subdir}
 done
 
-echo "Initializing \`leim' subdirectory"
-cp noleim-Makefile.in ${tempdir}/leim/Makefile.in
-
 echo "Making links to \`lisp' and its subdirectories"
 ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el.
 (cd lisp
@@ -385,32 +382,26 @@ echo "Making links to \`lisp' and its subdirectories"
    fi
  done )
 
-echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
+echo "Making links to \`leim' and its subdirectories"
 ### Don't distribute TAGS, or =*.el files.
 (cd leim
- ln makefile.nt makefile.w32-in ../${tempdir}/real-leim
- ln ChangeLog README ../${tempdir}/real-leim
-
- ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC
- ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC
- ln MISC-DIC/*.* ../${tempdir}/real-leim/MISC-DIC
- ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/real-leim/ja-dic
- ln Makefile.in ../${tempdir}/real-leim/Makefile.in
- ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/real-leim/quail
- rm -f ../${tempdir}/real-leim/quail/quick-b5.*
- rm -f ../${tempdir}/real-leim/quail/quick-cns.*
- rm -f ../${tempdir}/real-leim/quail/tsang-b5.*
- rm -f ../${tempdir}/real-leim/quail/tsang-cns.*
-
- cd ../${tempdir}/real-leim
+ ln makefile.nt makefile.w32-in ../${tempdir}/leim
+ ln ChangeLog README ../${tempdir}/leim
+
+ ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
+ ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
+ ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
+ ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic
+ ln Makefile.in ../${tempdir}/leim/Makefile.in
+ ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail
+ rm -f ../${tempdir}/leim/quail/quick-b5.*
+ rm -f ../${tempdir}/leim/quail/quick-cns.*
+ rm -f ../${tempdir}/leim/quail/tsang-b5.*
+ rm -f ../${tempdir}/leim/quail/tsang-cns.*
+
+ cd ../${tempdir}/leim
  rm -f TAGS =* */=*)
 
-### Move the real-leim directory outside of Emacs proper.
-(cd ${tempparent}
- mkdir ${emacsname}-leim
- mkdir ${emacsname}-leim/${emacsname}
- mv ${emacsname}/real-leim ${emacsname}-leim/${emacsname}/leim)
-
 echo "Making links to \`src'"
 ### Don't distribute =*.[ch] files, or the configured versions of
 ### config.in, paths.in, or Makefile.in, or TAGS.
@@ -679,20 +670,17 @@ if [ "${make_tar}" = yes ]; then
     compress* ) gzip_extension=.Z ;;
     * )         gzip_extension=.gz ;;
   esac
-  echo "Creating tar files"
+  echo "Creating tar file"
   (cd ${tempparent} ; tar cvf - ${emacsname} ) \
     | ${default_gzip} \
     > ${emacsname}.tar${gzip_extension}
-  (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \
-    | ${default_gzip} \
-    > leim-${version}${new_extension}.tar${gzip_extension}
 fi
 
 if [ "${clean_up}" = yes ]; then
   echo "Cleaning up the staging directory"
   rm -rf ${tempparent}
 else
-  (cd ${tempparent}; mv ${emacsname} ${emacsname}-leim ..)
+  (cd ${tempparent}; mv ${emacsname} ..)
   rm -rf ${tempparent}
 fi