Update of /cvsroot/mahogany/M/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26516/src
Modified Files:
Makefile
Log Message:
fixes for bundle creation under Mac OS X
Index: Makefile
===================================================================
RCS file: /cvsroot/mahogany/M/src/Makefile,v
retrieving revision 1.99
retrieving revision 1.100
diff -b -u -2 -r1.99 -r1.100
--- Makefile 12 Jan 2004 17:48:28 -0000 1.99
+++ Makefile 12 Jan 2004 23:44:07 -0000 1.100
@@ -41,11 +41,4 @@
include ../makerules
-# under Mac OS we need to build a bundle and not just a single binary
-ifdef USE_MAC
-M_APP := M_bundle
-else
-M_APP := M
-endif
-
# for cygwin/mingw we need to add resources to the main binary
# and use -mwindows in order to make GUI binary
@@ -65,5 +58,5 @@
# OK, we've got all the names and the rules to generate them; we can
# now actually specify the dependencies.
-binary: $(M_APP) $(MSOS)
+binary: M $(MSOS)
@true
@@ -79,5 +72,7 @@
include ../makeversion
-BUNDLE := M.app/Contents
+M_BUNDLE := M_bundle
+
+BUNDLE := Mahogany.app/Contents
# Target to build a Mac OS X application bundle
@@ -98,5 +93,5 @@
$(BUNDLE)/MacOS/M: M
@$(INSTALL) -d `dirname [EMAIL PROTECTED]
- @mv $< $@
+ @cp $< $@
$(BUNDLE)/Resources/M.rsrc: $(SOURCEDIR)/macosx/M.rsrc
@@ -108,5 +103,9 @@
@cp $< $@
-endif # USE_MAC
+else # !USE_MAC
+
+M_BUNDLE :=
+
+endif # USE_MAC/!USE_MAC
Mdll: libM.so
@@ -138,5 +137,5 @@
$(RM) $(MOBJS:.o=.d) $(MSOS:.so=.d)
-install:
+install: $(M_BUNDLE)
$(INSTALL_PROGRAM) $(INSTALL_OPTIONS) M $(BINDIR)
$(RM) $(BINDIR)/mahogany
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
