diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-04-18 20:45:01 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-04-18 20:45:01 +0000 |
| commit | e92ef06ca32689a87e4c0c9eb15b1df0f442d98e (patch) | |
| tree | c9cdea077e7bd147732b01242ca99a60c06dd00d /nsdefs.mk | |
| parent | 365804864dd9f87d93dfc7d6c557f5bd1ad2397e (diff) | |
| download | ds-e92ef06ca32689a87e4c0c9eb15b1df0f442d98e.tar.gz ds-e92ef06ca32689a87e4c0c9eb15b1df0f442d98e.tar.xz ds-e92ef06ca32689a87e4c0c9eb15b1df0f442d98e.zip | |
HP-UX IPF Porting changes
Diffstat (limited to 'nsdefs.mk')
| -rw-r--r-- | nsdefs.mk | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -53,6 +53,8 @@ else BUILD_ARCH := $(shell $(BUILD_ROOT)/nsarch) endif +NSOS_TEST1 := $(shell uname -m) + USE_HCL=1 PUMPKIN_AGE := 120 @@ -79,6 +81,18 @@ endif ifdef USE_64 NS64TAG=_64 +else + ifeq ($(BUILD_ARCH), HPUX) + ifeq ($(NSOS_TEST1),ia64) + NS64TAG=_32 + endif + endif +endif + +ifeq ($(BUILD_ARCH), HPUX) + ifeq ($(NSOS_TEST1),ia64) + NSOS_TEST1_TAG=_$(NSOS_TEST1) + endif endif # Check if we're on RHEL @@ -209,7 +223,7 @@ RTSUFFIX=-d endif endif endif -BASIC_OBJDIR=$(BUILD_ROOT)/built/$(ARCH)$(NS64TAG)-$(SECURITY)-$(DEBUG)$(RTSUFFIX)-$(B_FORTEZZA) +BASIC_OBJDIR=$(BUILD_ROOT)/built/$(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)-$(DEBUG)$(RTSUFFIX)-$(B_FORTEZZA) # # -- Directory Server Section ----------------------------------------------- @@ -235,7 +249,7 @@ ifeq ($(findstring RHEL, $(BUILD_ARCH)), RHEL) NS_BUILD_FLAVOR = $(BUILD_ARCH)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) ARCHPROCESSOR = $(BUILD_ARCH) else - NS_BUILD_FLAVOR = $(ARCH)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) + NS_BUILD_FLAVOR = $(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) endif NC_BUILD_FLAVOR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ ifeq ($(ARCH), WINNT) @@ -243,7 +257,7 @@ ifeq ($(PROCESSOR), ALPHA) ARCHPROCESSOR=$(ARCH)$(PROCESSOR) endif endif -COMMON_OBJDIR=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) +COMMON_OBJDIR=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) COMMON_OBJDIR_32=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) |