MacOS X Emacs

[Andreas Schwab <schwab@suse.de>]

I just tried to build Emacs under Darwin with $srcdir != $builddir and had
some problems with ${emacsapp}.  Is the following patch correct?  Then I
tried to run the emacs in the build directory, but I got an abort in
macterm, because GetNewCWindow returned 0.  Any idea?  (emacs -nw works
fine.)

Andreas.

2002-06-18  Andreas Schwab  <schwab@suse.de>

	* Makefile.in (${emacsapp}Contents/MacOS/Emacs): Support building
	outside source directory.
	(${emacsapp}Contents/Resources/Emacs.rsrc): Likewise.

--- Makefile.in.~1.255.~	2002-05-22 10:45:19.000000000 +0200
+++ Makefile.in	2002-06-18 20:19:20.000000000 +0200
@@ -1203,16 +1203,15 @@ macosx-app: ${emacsapp}Contents/MacOS/Em
   ${emacsapp}Contents/Resources/Emacs.rsrc
 
 ${emacsapp}Contents/MacOS/Emacs: emacs
-	if [ -d ${emacsapp}Contents/MacOS/ ]; then true; else \
-	  mkdir ${emacsapp}Contents/MacOS/; \
-	fi
+	${srcdir}/../mkinstalldirs ${emacsapp}Contents/MacOS
 	cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs Emacs
 
-${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
+${emacsapp}Contents/Resources/Emacs.rsrc: ${srcdir}/../mac/src/Emacs.r
+	${srcdir}/../mkinstalldirs ${emacsapp}Contents/Resources
 	/Developer/Tools/Rez -useDF -o \
 	${emacsapp}Contents/Resources/Emacs.rsrc \
 	/System/Library/Frameworks/Carbon.framework/Headers/Carbon.r \
-	../mac/src/Emacs.r
+	${srcdir}/../mac/src/Emacs.r
 #endif
 
 ${libsrc}emacstool: ${libsrc}emacstool.c

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."