[Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile 
Log Message:
use given name for moz objdir naming


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	14 Feb 2006 22:28:18 -0000	1.2
+++ Makefile	16 Feb 2006 21:33:47 -0000	1.3
@@ -1,3 +1,5 @@
+include ../../objdirname.mk
+
 GARNAME = fedora-adminserver
 GARVERSION = 1.0.2
 CATEGORIES = ds
@@ -14,6 +16,7 @@
 INSTALL_SCRIPTS = custom
 
 BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
+	MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
 	ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
 	ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
 	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
@@ -27,7 +30,7 @@
 BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work
 endif # NOJAVA
 
-ifndef DEBUG
+ifneq ($(DEBUG), full)
 BUILD_ARGS += BUILD_DEBUG=optimize
 endif