[Emacs-diffs] emacs ChangeLog make-dist

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/06/24 03:50:25

Modified files:
        .              : ChangeLog make-dist 

Log message:
        Warn if subdir does not exist in source.
        (nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib)
        (nextstep/GNUstep/Emacs.base/Resources/preferences.gorm):
        No longer make links.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.834&r2=1.835
http://cvs.savannah.gnu.org/viewcvs/emacs/make-dist?cvsroot=emacs&r1=1.260&r2=1.261

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -b -r1.834 -r1.835
--- ChangeLog   24 Jun 2009 03:47:07 -0000      1.834
+++ ChangeLog   24 Jun 2009 03:50:25 -0000      1.835
@@ -1,3 +1,10 @@
+2009-06-24  Glenn Morris  <address@hidden>
+
+       * make-dist: Warn if subdir does not exist in source.
+       (nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib)
+       (nextstep/GNUstep/Emacs.base/Resources/preferences.gorm):
+       No longer make links.
+
 2009-06-24  Yavor Doganov  <address@hidden>
 
       * make-dist (tempdir): Don't create directories preferences.gorm

Index: make-dist
===================================================================
RCS file: /sources/emacs/emacs/make-dist,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- make-dist   24 Jun 2009 03:47:07 -0000      1.260
+++ make-dist   24 Jun 2009 03:50:25 -0000      1.261
@@ -347,6 +347,9 @@
              nextstep/GNUstep/Emacs.base \
              nextstep/GNUstep/Emacs.base/Resources
 do
+  ## site-lisp for in-place installs (?).
+  [ "$subdir" = "site-lisp" ] || [ -d "$subdir" ] || \
+      echo "WARNING: $subdir not found, making anyway"
   echo "  ${tempdir}/${subdir}"
   mkdir ${tempdir}/${subdir}
 done
@@ -548,10 +551,6 @@
 (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)
@@ -560,10 +559,6 @@
 (cd nextstep/GNUstep/Emacs.base/Resources
  ln Emacs.desktop Info-gnustep.plist README 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