diff options
author | Steven Tamm <[email protected]> | 2002-12-28 18:35:52 +0000 |
---|---|---|
committer | Steven Tamm <[email protected]> | 2002-12-28 18:35:52 +0000 |
commit | ce0669d437238ed11e1919525d3a0f4200a2fa49 (patch) | |
tree | edb0450aa5600cdef7ad1d9be7729bae2734c6df | |
parent | 1ebc190a844e37a408a532be08ead50d5cd16910 (diff) |
* Makefile.in (macosx-bundle): Fixes to Mac OS X/Carbon port to
allow building in a different directory than source. Uses some
GNU Make extensions, but there is no other make on Mac OS X.
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/Makefile.in | 38 |
2 files changed, 33 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 39442d93d0..9467e2174f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-12-28 Steven Tamm <[email protected]> + + * Makefile.in (macosx-bundle): Fixes to Mac OS X/Carbon port to + allow building in a different directory than source. Uses some + GNU Make extensions, but there is no other make on Mac OS X. + 2002-12-26 Francesco Potort,Al(B <[email protected]> * data.c (Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local) diff --git a/src/Makefile.in b/src/Makefile.in index 1a8cf773a9..8d8e7007b2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -540,9 +540,11 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o #endif #ifdef HAVE_CARBON +mac = $(dot)$(dot)/mac/ XMENU_OBJ = MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o -emacsapp = ../mac/Emacs.app/ +emacsapp = $(PWD)/$(mac)Emacs.app/ +emacsappsrc = ${srcdir}/../mac/Emacs.app/ #else XMENU_OBJ = xmenu.o #endif @@ -1208,20 +1210,34 @@ macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ process.h coding.h $(config_h) -macosx-app: ${emacsapp}Contents/MacOS/Emacs \ +${emacsapp}Contents/Resources/English.lproj: + mkdir -p $@ + +ifneq (${emacsapp},${emacsappsrc}) +${emacsapp}Contents/Info.plist: ${emacsappsrc}Contents/Info.plist + cp $< $@ +${emacsapp}Contents/PkgInfo: ${emacsappsrc}Contents/PkgInfo + cp $< $@ +${emacsapp}Contents/Resources/Emacs.icns: ${emacsappsrc}Contents/Resources/Emacs.icns + mkdir -p ${emacsapp}Contents/Resources + cp $< $@ +${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings: ${emacsappsrc}Contents/Resources/English.lproj/InfoPlist.strings + cp $< $@ +endif + +macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \ + ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo\ + ${emacsapp}Contents/Resources/Emacs.icns \ + ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings +macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \ ${emacsapp}Contents/Resources/Emacs.rsrc - ${emacsapp}Contents/MacOS/Emacs: emacs - if [ -d ${emacsapp}Contents/MacOS/ ]; then true; else \ - mkdir ${emacsapp}Contents/MacOS/; \ - fi + mkdir -p ${emacsapp}Contents/MacOS/; cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs Emacs - ${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r - /Developer/Tools/Rez -useDF -o \ - ${emacsapp}Contents/Resources/Emacs.rsrc \ - /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r \ - ../mac/src/Emacs.r + /Developer/Tools/Rez -useDF \ + -o ${emacsapp}Contents/Resources/Emacs.rsrc \ + /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $< #endif ${libsrc}emacstool: ${libsrc}emacstool.c |