[Emacs-diffs] Changes to emacs/make-dist

[Eli Zaretskii]

Index: emacs/make-dist
diff -c emacs/make-dist:1.193 emacs/make-dist:1.194
*** emacs/make-dist:1.193       Sun Dec  9 08:17:52 2001
--- emacs/make-dist     Fri Dec 21 03:44:17 2001
***************
*** 309,316 ****
  
  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 \
              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 \
--- 309,316 ----
  
  echo "Creating subdirectories"
  for subdir in lisp site-lisp lispref lispintro \
!             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,328 ****
    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
--- 320,325 ----
***************
*** 385,416 ****
     fi
   done )
  
! echo "Making links to \`leim' and its subdirectories for the LEIM 
distribution"
  ### 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
   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.
--- 382,407 ----
     fi
   done )
  
! echo "Making links to \`leim' and its subdirectories"
  ### Don't distribute TAGS, or =*.el files.
  (cd 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 =* */=*)
  
  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,698 ****
      compress* ) gzip_extension=.Z ;;
      * )         gzip_extension=.gz ;;
    esac
!   echo "Creating tar files"
    (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 ..)
    rm -rf ${tempparent}
  fi
  
--- 670,686 ----
      compress* ) gzip_extension=.Z ;;
      * )         gzip_extension=.gz ;;
    esac
!   echo "Creating tar file"
    (cd ${tempparent} ; tar cvf - ${emacsname} ) \
      | ${default_gzip} \
      > ${emacsname}.tar${gzip_extension}
  fi
  
  if [ "${clean_up}" = yes ]; then
    echo "Cleaning up the staging directory"
    rm -rf ${tempparent}
  else
!   (cd ${tempparent}; mv ${emacsname} ..)
    rm -rf ${tempparent}
  fi