Author: rmeggins

Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947/setuputil

Modified Files: nsdefs.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/setuputil/nsdefs.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsdefs.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ nsdefs.mk 29 Sep 2005 22:08:54 -0000 1.2 @@ -60,11 +60,6 @@ else BUILD_PTHREADS= endif -ifdef FORTEZZA -BUILD_FORTEZZA=fortezza -else -BUILD_FORTEZZA=normal -endif

ifeq ($(USE_64), 1) NS64TAG = _64 @@ -184,19 +179,10 @@ endif

NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) -PLATFORM_DEST=$(NSPLATFORM_DIR)-$(SECURITY)$(INTL_DEF)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) +PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST) -DEFAULT_OBJDIR=$(PLATFORM_OBJDIR)-installer - -#NSPR_BASENAME=nspr4 - -ifeq ($(BUILD_MODULE), CONSOLE) -PRODUCT="Fedora Console" -DIR=console -NO_BUILD_NUM=true -NOSTDCLEAN=true -endif +DEFAULT_OBJDIR=$(PLATFORM_OBJDIR)

ifneq ($(NO_BUILD_NUM), true) GET_BUILD_NUM := $(shell cat $(ABS_ROOT)/$(NSPLATFORM_DIR)/buildnum.dat) @@ -273,7 +259,6 @@ ARCH=$(BUILD_ARCH) SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) -B_FORTEZZA=$(BUILD_FORTEZZA) BOMB=$(BUILD_BOMB) BUILD_DLL=$(BUILD_DLL_VERSION) ADMINDLL_NAME=$(BUILD_ADMIN_NAME)