[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools Makefile, 1.10, 1.11

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14139

Modified Files:
	Makefile 
Log Message:
[170348] RSEARCH needs to be updated
Fixed the broken build (64-bit).
LDFLAG (set in the tools/Makefile) was not passed to rsearch and ldclt.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	11 Jan 2006 01:54:24 -0000	1.10
+++ Makefile	28 Jan 2006 02:26:06 -0000	1.11
@@ -77,12 +77,16 @@
 OBJS1 += $(OBJDEST)/pwenc.o 
 
 ifeq ($(USE_64), 1)
-ifeq ($(ARCH), HPUX)
-LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
-endif
-ifeq ($(ARCH), SOLARIS)
-LDFLAGS += -xarch=v9 
-endif
+ ifeq ($(ARCH), HPUX)
+  ifeq ($(NSOS_RELEASE),B.11.23)
+   LDFLAGS += -lpthread +DD64
+  else
+   LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
+  endif
+ endif
+ ifeq ($(ARCH), SOLARIS)
+  LDFLAGS += -xarch=v9 
+ endif
 endif
 
 CFLAGS += $(ARCH_CFLAGS)
@@ -200,10 +204,10 @@
 	$(MKDIR) $(OBJDEST)
 
 buildRsearch:
-	cd rsearch; $(MAKE)
+	cd rsearch; $(MAKE) LDFLAGS="$(LDFLAGS)"
 
 buildLdclt:
-	cd ldclt; $(MAKE)
+	cd ldclt; $(MAKE) LDFLAGS="$(LDFLAGS)"
 
 clean:
 	-$(RM) $(ALL_OBJS)