diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
| commit | 44bc78939bed4a55db2bab87d9ed817a79d1260b (patch) | |
| tree | 4939464259a55e8dfd9356629ef7a9ad67842179 /nsdefs.mk | |
| parent | 385a06685da620c0753ef6daf187f4eb2d5f7517 (diff) | |
| download | ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.gz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.xz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.zip | |
Use new RHEL platform naming
Diffstat (limited to 'nsdefs.mk')
| -rw-r--r-- | nsdefs.mk | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -51,6 +51,18 @@ ifdef USE_64 NS64TAG=_64 endif +# Check if we're on RHEL +ifeq ($(BUILD_ARCH), Linux) + ARCH_TEST := $(shell cat /etc/redhat-release) + ifeq ($(findstring Taroon, $(ARCH_TEST)),Taroon) + BUILD_ARCH = RHEL3 + else + ifeq ($(findstring Nahant, $(ARCH_TEST)),Nahant) + BUILD_ARCH = RHEL4 + endif + endif +endif + # Should we build Java code on this platform? ifndef BUILD_JAVA_CODE ifeq ($(BUILD_ARCH),SOLARIS) @@ -140,7 +152,11 @@ endef # # Set up these names because most of the makefiles use them now. # -ARCH=$(BUILD_ARCH) +ifeq ($(findstring RHEL, $(BUILD_ARCH)), RHEL) + ARCH = Linux +else + ARCH=$(BUILD_ARCH) +endif SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) B_FORTEZZA=$(BUILD_FORTEZZA) @@ -185,7 +201,12 @@ ARCHPROCESSOR=$(ARCH) ifdef INCLUDE_SSL SSL_PREFIX=-ssl endif -NS_BUILD_FLAVOR = $(ARCH)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR) +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) +endif NC_BUILD_FLAVOR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ ifeq ($(ARCH), WINNT) ifeq ($(PROCESSOR), ALPHA) |