[Fedora-directory-commits] ldapserver nsconfig.mk,1.18,1.19

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30291

Modified Files:
	nsconfig.mk 
Log Message:
Fixing Solaris build
1) NSCONFIG accidentally got a white space (for non-Linux platforms)
2) Solaris needs to include limits.h explicitly



Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nsconfig.mk	15 Feb 2006 22:53:45 -0000	1.18
+++ nsconfig.mk	28 Feb 2006 21:51:21 -0000	1.19
@@ -286,23 +286,21 @@
     ifeq ($(NSOS_ARCH),HP-UX)
       NSOS_TEST1       := $(shell uname -m)
       ifeq ($(NSOS_TEST1), ia64)
-        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
-        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
       else
-        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
-        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
       endif
     else
     ifeq ($(NSOS_TEST1),i86pc)
-      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
-      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
     else
-      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
-      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
     endif
     endif
-    NSCONFIG += $(NS64TAG)
-    NSCONFIG_NOTAG += $(NS64TAG)
   endif
 endif