From 0da746de61f2ec6ae31da3a4f21bb6c2b8c326f9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 24 Jun 2009 03:50:25 +0000 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++-- make-dist | 11 +++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index edf53844811..b035fdd27e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +2009-06-24 Glenn Morris + + * 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 - * make-dist (tempdir): Don't create directories preferences.gorm - and preferences.nib, they are no longer required. + * make-dist (tempdir): Don't create directories preferences.gorm + and preferences.nib, they are no longer required. 2009-06-21 Chong Yidong diff --git a/make-dist b/make-dist index 362f06502c2..38275f9fc49 100755 --- a/make-dist +++ b/make-dist @@ -347,6 +347,9 @@ for subdir in lisp site-lisp \ 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 @@ echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/English.lpr (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 @@ echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" (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 -- 2.39.2