[Fedora-directory-commits] esc/src/xulrunner Makefile,1.1,1.2

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4516

Modified Files:
	Makefile 
Log Message:
Mac univeral binary.


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	13 Sep 2006 17:48:05 -0000	1.1
+++ Makefile	10 Jan 2007 02:23:17 -0000	1.2
@@ -42,7 +42,9 @@
 
 $(MOZ_OBJDIR): $(MOZ_SRCDIR)/.mozconfig $(MOZ_SRCDIR)/client.mk
 	(cd $(MOZ_SRCDIR) ; make -f client.mk build ) 
+ifneq ($(OS_ARCH),Darwin)
 	(cd $(MOZ_OBJDIR)/xulrunner/installer ; make )
+endif
 	touch $(MOZ_OBJDIR)
 
 $(MOZ_SRCDIR)/.mozconfig: $(SOURCE_XP_DIR)/target.$(TYPE)
@@ -68,6 +70,11 @@
 	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
 	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
 endif
+ifeq ($(OS_ARCH),Darwin)
+	echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
+	echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)
+endif
+
 ifeq ($(OS_ARCH), WINNT)
 	echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE)
 endif