Author: rmeggins

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

Modified Files: nsdefs.mk pkgadminutil.mk Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup

Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsdefs.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ nsdefs.mk 29 Sep 2005 22:10:09 -0000 1.2 @@ -62,11 +62,6 @@ else BUILD_PTHREADS= endif -ifdef FORTEZZA -BUILD_FORTEZZA=fortezza -else -BUILD_FORTEZZA=normal -endif

ifeq ($(USE_64), 1) NS64TAG = _64 @@ -212,7 +207,6 @@ echo BUILD_MODULE=$(BUILD_MODULE) echo BUILD_SECURITY=$(BUILD_SECURITY) echo BUILD_DEBUG=$(BUILD_DEBUG) -echo BUILD_FORTEZZA=$(BUILD_FORTEZZA) echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS) echo BUILD_BOMB=$(BUILD_BOMB) echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION) @@ -228,7 +222,6 @@ ARCH=$(BUILD_ARCH) SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) -B_FORTEZZA=$(BUILD_FORTEZZA) BOMB=$(BUILD_BOMB) NSPR_THREADS=$(BUILD_NSPR_THREADS) BUILD_DLL=$(BUILD_DLL_VERSION) @@ -255,7 +248,7 @@ #

ifndef OBJDIR -OBJDIR=$(ABS_ROOT)/built/$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) +OBJDIR=$(ABS_ROOT)/built/$(FULL_RTL_OBJDIR) endif

ifndef COMMON_OBJDIR

Index: pkgadminutil.mk =================================================================== RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pkgadminutil.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ pkgadminutil.mk 29 Sep 2005 22:10:09 -0000 1.2 @@ -25,28 +25,18 @@

BUILD_ROOT:=. include $(BUILD_ROOT)/nsdefs.mk +include $(BUILD_ROOT)/nsconfig.mk

MKDIR=mkdir -p

# Destination directories for package -ifeq ($(USE_PTHREADS), 1) - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) - PKGDIR=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -else - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) - PKGDIR=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -endif +PKGDIR_NAME=$(FULL_RTL_OBJDIR) +PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) +PKGDIR=$(PKGTOP)

ifdef BUILD_INTL -ifeq ($(USE_PTHREADS), 1) - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-intl-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -else - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-intl-$(DEBUG)-$(B_FORTEZZA) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -endif +PKGDIR_NAME+=-intl +PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) PKGDIR=$(PKGTOP) endif