X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1d650ff1bdcc1400a54ad77e8d074b880df66c80..7d18d35c95c5829bb0a23d16546471014c9af392:/make-dist

diff --git a/make-dist b/make-dist
index 4d76be2fa2..41631f2f5e 100755
--- a/make-dist
+++ b/make-dist
@@ -101,8 +101,10 @@ ln make-dist ${tempdir}
 cp config.sub ${tempdir}
 
 echo "Creating subdirectories."
-for subdir in lisp lisp/term local-lisp external-lisp \
-	      src src/m src/s lib-src oldXMenu \
+# I think we're not going to distribute anything in external-lisp, so
+# I've removed it from this list.
+for subdir in lisp lisp/calc-2.02 lisp/term local-lisp \
+	      src src/m src/s src/bitmaps lib-src oldXMenu \
 	      etc lock cpp info man shortnames vms; do
   mkdir ${tempdir}/${subdir}
 done
@@ -120,6 +122,16 @@ echo "Making links to \`lisp'."
  rm -f site-load site-load.el site-load.elc
  rm -f default default.el default.elc)
 
+echo "Making links to \`lisp/calc-2.02'."
+### Don't distribute =*.el files or backups.
+(cd lisp/calc-2.02
+ ln [a-zA-Z]*.el ../../${tempdir}/lisp/calc-2.02
+ ln [a-zA-Z]*.elc ../../${tempdir}/lisp/calc-2.02
+ ln calc.info* calc.texinfo calc-refcard.* ../../${tempdir}/lisp/calc-2.02
+ ln INSTALL Makefile README README.prev ../../${tempdir}/lisp/calc-2.02
+ cd ../../${tempdir}/lisp/calc-2.02
+ rm -f *~)
+
 echo "Making links to \`lisp/term'."
 ### Don't distribute =*.el files.
 (cd lisp/term
@@ -127,12 +139,12 @@ echo "Making links to \`lisp/term'."
  ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term
  ln README ../../${tempdir}/lisp/term)
 
-echo "Making links to \`external-lisp'."
-### Don't distribute =*.el files.
-(cd external-lisp
- ln [a-zA-Z]*.el ../${tempdir}/external-lisp
- ln [a-zA-Z]*.elc ../${tempdir}/external-lisp
- ln ChangeLog README ../${tempdir}/external-lisp)
+### echo "Making links to \`external-lisp'."
+### ### Don't distribute =*.el files.
+### (cd external-lisp
+###  ln [a-zA-Z]*.el ../${tempdir}/external-lisp
+###  ln [a-zA-Z]*.elc ../${tempdir}/external-lisp
+###  ln ChangeLog README ../${tempdir}/external-lisp)
 
 echo "Making links to \`src'."
 ### Don't distribute =*.[ch] files, or the configured versions of
@@ -141,7 +153,7 @@ echo "Making links to \`src'."
  echo "  (If we can't link gmalloc.c, that's okay.)"
  ln [a-zA-Z]*.c ../${tempdir}/src
  ## Might be a symlink to a file on another filesystem.
- cp gmalloc.c ../${tempdir}/src
+ test -f ../${tempdir}/src/gmalloc.c || cp gmalloc.c ../${tempdir}/src
  ln [a-zA-Z]*.h ../${tempdir}/src
  ln [a-zA-Z]*.s ../${tempdir}/src
  ln README Makefile.in ymakefile ChangeLog config.h.in paths.h.in \
@@ -154,6 +166,10 @@ echo "Making links to \`src'."
    etags *.h *.c ../lisp/*.el
  fi)
 
+echo "Making links to \`src/bitmaps'."
+(cd src/bitmaps
+ ln README *.xbm ../../${tempdir}/src/bitmaps)
+
 echo "Making links to \`src/m'."
 (cd src/m
  ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/m)
@@ -180,17 +196,12 @@ echo "Making links to \`etc'."
 (cd etc
  ln [0-9a-zA-Z]* ../${tempdir}/etc
  cd ../${tempdir}/etc
- ## Avoid an error when expanding the wildcards later.
- for dummy in DOC-dummy dummy~ \#dummy\# dummy.dvi dummy.log; do
-   ln MACHINES ${dummy}
- done
- rm -f DOC* *~ \#*\# *.dvi *.log core)
-
-### For now, we comment these out, since I'm not changing them any.
-###!! echo "Making links to \`cpp'."
-###!! (cd cpp
-###!!  ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
-###!! 
+ rm -f DOC* *~ \#*\# *.dvi *.log *,v core)
+
+echo "Making links to \`cpp'."
+(cd cpp
+ ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
+
 ###!! echo "Making links to \`info'."
 ###!! # Don't distribute backups or autosaves.
 ###!! (cd info
@@ -199,12 +210,14 @@ echo "Making links to \`etc'."
 ###!!  # Avoid an error when expanding the wildcards later.
 ###!!  ln emacs dummy~ ; ln emacs \#dummy\#
 ###!!  rm -f *~ \#*\# core)
-###!! 
-###!! echo "Making links to \`man'."
-###!! (cd man
-###!!  ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
-###!!  ln *.c ../${tempdir}/man
-###!!  ln ChangeLog Makefile README split-man ../${tempdir}/man)
+
+echo "Making links to \`man'."
+(cd man
+ ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
+ ln *.c ../${tempdir}/man
+ test -f README && ln README ../${tempdir}/man
+ test -f Makefile && ln Makefile ../${tempdir}/man
+ ln ChangeLog split-man ../${tempdir}/man)
 
 echo "Making links to \`shortnames'."
 (cd shortnames
@@ -217,14 +230,18 @@ echo "Making links to \`vms'."
  cd ../${tempdir}/vms
  rm -f *~)
 
-echo "Making sure copying notices are all symlinks to \`etc/COPYING'."
+### It would be nice if they could all be symlinks to etc's copy, but
+### you're not supposed to have any symlinks in distribution tar files.
+echo "Making sure copying notices are all copies of \`etc/COPYING'."
 rm -f ${tempdir}/etc/COPYING
 cp etc/COPYING ${tempdir}/etc/COPYING
-for subdir in lisp external-lisp src lib-src info shortnames; do
+# I think we're not going to distribute anything in external-lisp, so
+# I've removed it from this list.
+for subdir in lisp src lib-src info shortnames; do
   if [ -f ${tempdir}/${subdir}/COPYING ]; then
     rm ${tempdir}/${subdir}/COPYING
   fi
-  ln -s ../etc/COPYING ${tempdir}/${subdir}
+  cp etc/COPYING ${tempdir}/${subdir}
 done
 
 if [ "${newer}" ]; then