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

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

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


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	14 Feb 2006 22:28:25 -0000	1.2
+++ Makefile	16 Feb 2006 21:33:53 -0000	1.3
@@ -1,3 +1,5 @@
+include ../../objdirname.mk
+
 GARNAME = fedora-adminutil
 GARVERSION = 1.0.2
 CATEGORIES = ds
@@ -12,12 +14,12 @@
 BUILD_SCRIPTS = $(WORKSRC)/Makefile
 #INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = custom
-BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4
+BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) 
 
-ifndef DEBUG
-BUILD_ARGS += BUILD_DEBUG=optimize
-else
+ifeq ($(DEBUG), full)
 BUILD_ARGS += DEBUG=full
+else
+BUILD_ARGS += BUILD_DEBUG=optimize
 endif
 
 configure-custom: