(eshell-quote-backslash): Restrict previous change to XEmacs, since it

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 866b4351e9bc0b10ac3cef2738e6748c943db5d2..19d7ddc79b030695cb519f784901150b0fc9101d 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -141,7 +141,7 @@ then
       /*) ;;
       *)
        if [ ! -f "$EMACS" ]; then
-         echo "$0: You must specify the EMACS environment variable " \
+         echo "$0: You must set the EMACS environment variable " \
               "to an absolute file name." 2>&1
          exit 1
        fi;;
@@ -340,7 +340,17 @@ for subdir in lisp site-lisp \
              doc/misc doc/man doc/lispref doc/lispintro m4 msdos vms mac \
              mac/src mac/Emacs.app mac/Emacs.app/Contents \
              mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
-             mac/Emacs.app/Contents/Resources/English.lproj
+             mac/Emacs.app/Contents/Resources/English.lproj \
+             nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
+             nextstep/Cocoa/Emacs.base/Contents \
+             nextstep/Cocoa/Emacs.base/Contents/Resources \
+             nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj \
+             nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib \
+             nextstep/Cocoa/Emacs.xcodeproj \
+             nextstep/GNUstep \
+             nextstep/GNUstep/Emacs.base \
+             nextstep/GNUstep/Emacs.base/Resources \
+             nextstep/GNUstep/Emacs.base/Resources/preferences.gorm
 do
   echo "  ${tempdir}/${subdir}"
   mkdir ${tempdir}/${subdir}
@@ -351,13 +361,6 @@ echo "Making links to \`lisp' and its subdirectories"
 (cd lisp
  ln [a-zA-Z]*.el ../${tempdir}/lisp
  ln [a-zA-Z]*.elc ../${tempdir}/lisp
- ln [a-zA-Z]*.dat ../${tempdir}/lisp
- for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
-   # If there are no images, the shell won't expand the pattern.
-   if [ -f $img ]; then
-     ln $img ../${tempdir}/lisp
-   fi
- done
  ## simula.el doesn't keep abbreviations in simula.defns any more.
  ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
  ln ChangeLog ChangeLog.*[0-9] ../${tempdir}/lisp
@@ -438,7 +441,7 @@ echo "Making links to \`src'"
  echo "  (It is ok if ln fails in some cases.)"
  ln [a-zA-Z]*.c ../${tempdir}/src
  ln [a-zA-Z]*.h ../${tempdir}/src
- ln [a-zA-Z]*.s ../${tempdir}/src
+ ln [a-zA-Z]*.m ../${tempdir}/src
  ln [a-zA-Z]*.in ../${tempdir}/src
  ln [a-zA-Z]*.opt ../${tempdir}/src
  ## If we ended up with a symlink, or if we did not get anything
@@ -479,7 +482,7 @@ echo "Making links to \`src/s'"
 
 echo "Making links to \`lib-src'"
 (cd lib-src
- ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src
+ ln [a-zA-Z]*.[chmy] ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
  ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src
  ln makefile.w32-in ../${tempdir}/lib-src
@@ -563,6 +566,38 @@ echo "Making links to \`msdos'"
  cd ../${tempdir}/msdos
  rm -f =*)
 
+echo "Making links to \`nextstep'"
+(cd nextstep
+ ln AUTHORS ChangeLog FOR-RELEASE README.txt compile ../${tempdir}/nextstep)
+
+echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'"
+(cd nextstep/Cocoa/Emacs.base/Contents
+ ln Info.plist PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents)
+
+echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources'"
+(cd nextstep/Cocoa/Emacs.base/Contents/Resources
+ ln Credits.html Emacs.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources)
+
+echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj'"
+(cd nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj
+ ln InfoPlist.strings ../../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj)
+
+echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib'"
+(cd nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib
+ ln *.nib ../../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib)
+
+echo "Making links to \`nextstep/Cocoa/Emacs.xcodeproj'"
+(cd nextstep/Cocoa/Emacs.xcodeproj
+ ln project.pbxproj ../../../${tempdir}/nextstep/Cocoa/Emacs.xcodeproj)
+
+echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'"
+(cd nextstep/GNUstep/Emacs.base/Resources
+ ln Emacs.desktop Info-gnustep.plist emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources )
+
+echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources/preferences.gorm'"
+(cd nextstep/GNUstep/Emacs.base/Resources/preferences.gorm
+ ln data.classes data.info objects.gorm ../../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources/preferences.gorm )
+
 echo "Making links to \`oldXMenu'"
 (cd oldXMenu
  ln *.c *.h *.in ../${tempdir}/oldXMenu
@@ -613,19 +648,26 @@ done
 
 echo "Making links to \`etc/images'"
 (cd etc/images
- for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
-   if [ -f $img ]; then
-     ln $img ../../${tempdir}/etc/images
-   fi
+ for f in *; do
+     [ -f "$f" ] || continue
+     case $f in
+         (*~|\#*\#|*,v|=*|core) continue ;;
+     esac
+     ln $f ../../${tempdir}/etc/images
  done)
 
 for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \
            etc/images/low-color etc/images/mail etc/images/smilies ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
-     ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir}
-     cd ../../../${tempdir}/${dir}
-     rm -f *~ \#*\# *,v =* core)
+     for f in *; do
+         [ -f "$f" ] || continue
+         case $f in
+             (*~|\#*\#|*,v|=*|core) continue ;;
+         esac
+         ln $f ../../../${tempdir}/${dir}
+     done
+     )
 done
 
 for dir in etc/images/tree-widget/default etc/images/tree-widget/folder \