[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.3,1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/dsbuild/ds/mozilla

Modified Files:
	Makefile 
Log Message:
fix mozilla debug build; make USE_64=1 the default on x86_64


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	16 Feb 2006 21:34:04 -0000	1.3
+++ Makefile	24 Feb 2006 17:37:53 -0000	1.4
@@ -16,13 +16,13 @@
 BUILD_SCRIPTS = custom
 INSTALL_SCRIPTS = custom
 
-ifndef DEBUG
+ifeq ($(DEBUG), full)
+CONFIGURE_OPTS=--disable-optimize
+OBJDIR=DBG.OBJ
+else
 OPTFLAG="BUILD_OPT=1"
 CONFIGURE_OPTS=--disable-debug --enable-optimize
 OBJDIR=OPT.OBJ
-else
-CONFIGURE_OPTS=--enable-debug --disable-optimize
-OBJDIR=DBG.OBJ
 endif
 
 ifeq ($(USE_64), 1)
@@ -50,7 +50,8 @@
 # next, configure and make nspr
 	mkdir -p work/mozilla/dist/$(OBJDIR)
 	mkdir -p work/mozilla/nsprpub/$(OBJDIR)
-	cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \
+	cd work/mozilla/nsprpub/$(OBJDIR) && \
+		sh ../configure $(CONFIGURE_OPTS) \
 		--with-dist-prefix='$(NSPR_PREFIX)' \
 		--with-dist-includedir='$(NSPR_PREFIX)/include'