Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use NSS 3.3.1 (previously was using NSS 3.3).

Browse Source 
Vendor independence:
    add VENDOR_NAME and VENDOR_VERSION gmake variables.
New packaging options:
    PKG_PRIVATE_HDRS=0   do not ship private headers
    PKG_PRIVATE_LIBS=0   do not ship private libraries
    PKG_DEP_LIBS=0       do not ship dependent libraries
Remove references to Airius (not safe to use in examples).


git-svn-id: svn://10.0.0.236/branches/ldapcsdk_branch_50@105970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcs%netscape.com
2001-10-22 21:52:20 +00:00
parent 5c617f6d3c
commit 5d3df9f2ef
23 changed files with 134 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/directory/Makefile
View File

@@ -26,8 +26,8 @@ NSS_TREE = ../security
MOD_DEPTH = ../nsprpub
CORECONFDIR = ../coreconf
ALTCORECONFDIR = ../../coreconf
NSPR_VERSION = 4.1.1
NSS_VERSION = 3.2.1
NSPR_VERSION = 4.1.2
NSS_VERSION = 3.3.1
DEPTH = ..
CONFIGDIR = c-sdk/config
MOD_DEPTH = c-sdk
@@ -49,8 +49,10 @@ all: FORCE
@echo " USE_64=1 for building 64 bit versions"
@echo " BUILD_CLU=1 build command line utilities"
@echo " COMPS_FROM_OBJDIR=1 use components from ../dist/$(OBJDIR_NAME)"
@echo " VENDOR_NAME=string SDK vendor name (default $(DEFAULT_VENDOR_NAME))"
@echo " VENDOR_VERSION=# vendor specific version number * 100 (default $(DEFAULT_VENDOR_VERSION))"
@echo
@echo iPlanet internal options
@echo Internal options
@echo
@echo " gmake buildAndPkgLdapSDK"
@echo " gmake PullSDKComponents"
@@ -59,14 +61,18 @@ all: FORCE
@echo " HAVE_LIBNLS=1 for building/linking with LIBNLS"
@echo " HAVE_CCONF=1 for building with components"
@echo " HAVE_SVRCORE=1 for building with svrcore"
@echo " DONT_REPULL=1 for not repulling components"
@echo " DONT_REPULL=1 for not repulling components"
@echo " PKG_PRIVATE_HDRS=0 do not ship private headers"
@echo " PKG_PRIVATE_LIBS=0 do not ship private libraries"
@echo " PKG_DEP_LIBS=0 do not ship dependent libraries"
@echo
@echo " For iPlanet builds, coreconf must be installed"
@echo " For internal builds, coreconf must be installed"
@echo " in $(CORECONFDIR)"
buildLdapClientSDK export: PullSDKComponents
@echo
@echo ==== Starting iPlanet LDAP Client SDK ==========
@echo ==== Starting LDAP Client SDK ==========
@echo
ifneq ($(HAVE_CCONF), 1)
@if [ -d $(NSPR_TREE)/ ]; then \
@@ -89,7 +95,7 @@ else
cp -r $(ALTCORECONFDIR) $(CORECONFDIR); \
else \
echo "No coreconf directory found"; \
exit 0; \
exit 1; \
fi \
fi
@if [ -d $(CORECONFDIR)/ ]; then \
@@ -116,7 +122,7 @@ endif
pkgLdapSDK: FORCE
@echo
@echo ==== Starting iPlanet LDAP Client SDK packaging ===
@echo ==== Starting LDAP Client SDK packaging ===
@echo
@if [ -d $(DIST_TREE)/ ]; then \
cd $(LDAP_DEPTH)/c-sdk/; \
@@ -143,7 +149,7 @@ ifeq ($(HAVE_CCONF), 1)
cp -r $(ALTCORECONFDIR) $(CORECONFDIR); \
else \
echo "No coreconf directory found"; \
exit 0; \
exit 1; \
fi \
fi
@if [ -d $(CORECONFDIR)/ ]; then \

18
mozilla/directory/c-sdk/build.mk
View File

@@ -20,10 +20,22 @@
# Contributor(s):
#
DEFAULT_VENDOR_NAME=mozilla.org
DEFAULT_VENDOR_VERSION=500
ifndef VENDOR_NAME
VENDOR_NAME = $(DEFAULT_VENDOR_NAME)
endif
ifndef VENDOR_VERSION
VENDOR_VERSION = $(DEFAULT_VENDOR_VERSION)
endif
ifdef HAVE_CCONF
# component tags for iPlanet build only
# component tags for internal build only
NSPR_RELEASE_TAG=v4.1.2
NSS_RELEASE_TAG =NSS_3_3_RTM
NSS_RELEASE_TAG =NSS_3_3_1_RTM
SVRCORE_RELEASE_TAG=SVRCORE_3_3_RTM
# NSPR, NSS, and SVRCORE already had existing Solaris 5.8 symbolic
# link to a Solaris 5.6 version. Hence, the new respun components
@@ -38,7 +50,7 @@ OS_VERS := $(shell uname -r)
ifeq ($(OS_VERS),5.8)
ifneq ($(OS_TEST),i86pc)
NSPR_RELEASE_TAG=v4.1.2/forte6
NSS_RELEASE_TAG =NSS_3_3_RTM/forte6.2
NSS_RELEASE_TAG =NSS_3_3_1_RTM/forte6
SVRCORE_RELEASE_TAG=SVRCORE_3_3_RTM/forte6
endif
endif

37
mozilla/directory/c-sdk/ldap/build/replace.pl Executable file
View File

@@ -0,0 +1,37 @@
#
# replace.pl: perform simple string substitution on a file
# the first line in the input (template) file is also discarded.
#
# usage: perl replace.pl KEYWORD=VALUE... < TMPLFILE > OUTFILE
#
# created 17 October 2001 by Mark Smith <mcs@netscape.com>
@keywords = ();
@values = ();
$count = 0;
foreach $str (@ARGV) {
($key,$val) = split( "=", $str, 2 );
push (@keywords, $key);
push (@values, $val);
++$count;
}
$first_line = 1;
while(<STDIN>) {
$line = $_;
$count = 0;
foreach $str (@keywords) {
$line =~ s/{{$str}}/$values[$count]/g;
++$count;
}
if ( ! $first_line ) {
print $line;
} else {
$first_line = 0;
}
}
exit 0;

1
mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
View File

@@ -37,6 +37,7 @@ INCLUDES += -I../../../../..$(HEADERDIR)/include \
-I../../../../../dist/include \
-I../../../../../dist/public/security \
-I../../../../../dist/public/nss \
-I$(NSCP_DISTDIR)/public/ldap \
-I../../../ldap/include \
ifeq ($(HAVE_CCONF), 1)

4
mozilla/directory/c-sdk/ldap/docs/relnotes_41.htm
View File

@@ -439,7 +439,7 @@ LDAP *ld;
LDAPURLDesc *ludpp;
int res;
char *url = &quot;ldap://phonebook.airius.com:2389 directory.airius.com:389/o=airius.com&quot;;
char *url = &quot;ldap://phonebook.example.com:2389 directory.example.com:389/o=example.com&quot;;
res = ldap_url_parse(url, &amp;ludpp);
ld = ldap_init(ludpp-&gt;host, ludpp-&gt;port);
@@ -450,7 +450,7 @@ ld = ldap_init(ludpp-&gt;host, ludpp-&gt;port);
<P>Note that <TT>ludpp-&gt;port</TT> is set to the port identified on the last host in the URL string. If <TT>ludpp-&gt;port</TT> is used as shown here, then the last port identified on the URL string becomes the default port for any hosts for which a port is not explicitly set. Using the example above, suppose the URL string contained the following:</P>
<PRE>
ldap://phonebook.airius.com phonebook2.airius.com phonebook3.airius.com:2389/o=airius.com
ldap://phonebook.example.com phonebook2.example.com phonebook3.example.com:2389/o=example.com
</PRE>
<P>Here, <TT>ldap_init()</TT> would use port 2389 for all the hosts that it tries. If the last host in the string does not identify a port, then <TT>ludpp-&gt;port</TT> is set to zero (0). Setting the port to 0 tells <TT>ldap_init()</TT> to use the default port, which is 389 for <TT>ldap://</TT> urls and 636 for <TT>ldaps://</TT> urls.</P>

5
mozilla/directory/c-sdk/ldap/examples/README
View File

@@ -5,7 +5,7 @@ This directory contains some sample LDAP code to help you understand
how to use the Directory SDK. These examples are designed to work against
the sample data contained in the Netscape Directory Server 4.x
distribution. If you want to run these samples, you will need to have
a working LDAP server running, and the sample "airius.com" data
a working LDAP server running, and the sample "example.com" data
loaded.
-------------------
@@ -45,7 +45,8 @@ ldap_search_ext_s() function.
rdentry.c
---------
Shows how to use ldap_search_s() to retrieve a particular entry from the
directory. In this example, the entry "uid=bjensen, ou=People, o=airius.com"
directory. In this example, the entry:
uid=bjensen,ou=People,dc=example,dc=com
is retrieved and displayed.
getattrs.c

2
mozilla/directory/c-sdk/ldap/examples/examples.h
View File

@@ -61,7 +61,7 @@
/*
* Subtree to search
*/
#define MY_SEARCHBASE "o=Airius.com"
#define MY_SEARCHBASE "dc=example,dc=com"
/*
* Place where people entries are stored

4
mozilla/directory/c-sdk/ldap/examples/modattrs.c
View File

@@ -22,7 +22,7 @@
/*
* Modify an entry:
* - replace any existing "mail" attribute values with "babs@airius.com"
* - replace any existing "mail" attribute values with "babs@example.com"
* - add a new value to the "description" attribute
*/
@@ -49,7 +49,7 @@ main( int argc, char **argv )
/* construct the list of modifications to make */
mod0.mod_op = LDAP_MOD_REPLACE;
mod0.mod_type = "mail";
vals0[0] = "babs@airius.com";
vals0[0] = "babs@example.com";
vals0[1] = NULL;
mod0.mod_values = vals0;

4
mozilla/directory/c-sdk/ldap/examples/modrdn.c
View File

@@ -22,8 +22,8 @@
/*
* Modify the RDN (relative distinguished name) of an entry. In this
* example, we change the dn "cn=Jacques Smith, o=Airius.com"
* to "cn=Jacques M Smith, o=Airius.com".
* example, we change the dn "cn=Jacques Smith,ou=People,dc=example,dc=com
* to "cn=Jacques M Smith,ou=People,dc=example,dc=com.
*
* Since it is an error to either (1) attempt to modrdn an entry which
* does not exist, or (2) modrdn an entry where the destination name

2
mozilla/directory/c-sdk/ldap/examples/srvrsort.c
View File

@@ -83,7 +83,7 @@ main( int argc, char **argv )
/* Search for all entries in Sunnyvale */
rc = ldap_search_ext_s( ld, "o=Airius.com", LDAP_SCOPE_SUBTREE,
rc = ldap_search_ext_s( ld, PEOPLE_BASE, LDAP_SCOPE_SUBTREE,
"(objectclass=person)", NULL, 0, requestctrls, NULL, NULL, 0,
&result );

2
mozilla/directory/c-sdk/ldap/examples/ssearch.c
View File

@@ -85,7 +85,7 @@ main( int argc, char **argv )
}
/* search for all entries with surname of Jensen */
if ( ldap_search_s( ld, "o=Airius.com", LDAP_SCOPE_SUBTREE,
if ( ldap_search_s( ld, PEOPLE_BASE, LDAP_SCOPE_SUBTREE,
"(sn=jensen)", NULL, 0, &result ) != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_search_s" );
if ( result == NULL ) {

2
mozilla/directory/c-sdk/ldap/examples/ssnoauth.c
View File

@@ -63,7 +63,7 @@ main( int argc, char **argv )
}
/* search for all entries with surname of Jensen */
if ( ldap_search_s( ld, "o=Airius.com", LDAP_SCOPE_SUBTREE,
if ( ldap_search_s( ld, PEOPLE_BASE, LDAP_SCOPE_SUBTREE,
"(sn=jensen)", NULL, 0, &result ) != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_search_s" );
if ( result == NULL ) {

3
mozilla/directory/c-sdk/ldap/examples/windows/winldap/winldap.cpp
View File

@@ -96,7 +96,8 @@ BOOL LdapApp::InitInstance()
m_dirHost = GetProfileString( "Connection", "host", "localhost" );
m_dirPort = GetProfileInt( "Connection", "port", 389 );
m_searchBase = GetProfileString( "Search", "base", "o=airius.com" );
m_searchBase = GetProfileString( "Search", "base", "dc=example,dc=com" );
m_scope = GetProfileInt( "Search", "scope", LDAP_SCOPE_SUBTREE );
m_searchFilter = GetProfileString( "Search", "filter", "objectclass=*" );

20
mozilla/directory/c-sdk/ldap/include/Makefile.client
View File

@@ -33,7 +33,6 @@ HEADERS = \
disptmpl.h \
lber.h \
ldap.h \
ldap-standard.h \
ldap-extension.h \
ldap-platform.h \
ldap-to-be-deprecated.h \
@@ -52,6 +51,8 @@ PRIVATEHEADERS = \
ldaplog.h \
$(NULL)
GENERATED_HEADERS = ldap-standard.h
include $(NSPR_TREE)/config/rules.mk
include ../../build.mk
@@ -59,6 +60,7 @@ ETCDIR = $(DIST)/etc
INCLUDEDIR = $(XPDIST)/public/ldap
PRIVATEINCDIR = $(XPDIST)/public/ldap-private
DELHEADERS = $(addprefix $(INCLUDEDIR)/, $(HEADERS))
GENHEADERS = $(addprefix $(INCLUDEDIR)/, $(GENERATED_HEADERS))
ifeq ($(OS_ARCH), WINNT)
# Is this correct?
@@ -69,16 +71,26 @@ endif
DIRVER_PROG = $(DIRVER_PATH)/dirver$(BIN_SUFFIX)
###########################################################################
all export:: FORCE
$(NSINSTALL) -D $(INCLUDEDIR)
all export:: $(INCLUDEDIR) $(GENHEADERS)
$(NSINSTALL) -D $(PRIVATEINCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR)
$(INCLUDEDIR): FORCE
$(NSINSTALL) -D $(INCLUDEDIR)
$(INCLUDEDIR)/ldap-standard.h: ldap-standard-tmpl.h
perl ../build/replace.pl \
LDAP_VENDOR_NAME="$(VENDOR_NAME)" \
LDAP_VENDOR_VERSION="$(VENDOR_VERSION)" \
< $< > $@
install:: export
clean::
clean:: FORCE
-$(RM) $(GENHEADERS)
FORCE:

6
mozilla/directory/c-sdk/ldap/include/ldap-extension.h
View File

@@ -98,10 +98,10 @@ extern "C" {
#define LDAP_CONTROL_PWEXPIRED "2.16.840.1.113730.3.4.4"
#define LDAP_CONTROL_PWEXPIRING "2.16.840.1.113730.3.4.5"
/* Suppress virtual/inherited attribute values (iPlanet DS 5.0 and later) */
/* Suppress virtual/inherited attribute values */
#define LDAP_CONTROL_REAL_ATTRS_ONLY "2.16.840.1.113730.3.4.17"
/* Only return virtual/inherited attribute values (iPlanet DS 5.1 and later) */
/* Only return virtual/inherited attribute values */
#define LDAP_CONTROL_VIRTUAL_ATTRS_ONLY "2.16.840.1.113730.3.4.19"
@@ -177,8 +177,6 @@ LDAP_API(int) LDAP_CALL ldap_parse_entrychange_control( LDAP *ld,
* extension -- LDAP_API_FEATURE_PROXY_AUTHORIZATION)
* ldap_create_proxyauth_control() is for the old (version 1) control.
* ldap_create_proxiedauth_control() is for the newer (version 2) control.
* Version 1 is supported by iPlanet Directory Server 4.1 and later.
* Version 2 is supported by iPlanet Directory Server 5.0 and later.
*/
LDAP_API(int) LDAP_CALL ldap_create_proxyauth_control( LDAP *ld,
const char *dn, const char ctl_iscritical, LDAPControl **ctrlp );

5
mozilla/directory/c-sdk/ldap/include/ldap-standard.h → mozilla/directory/c-sdk/ldap/include/ldap-standard-tmpl.h
View File

@@ -1,3 +1,4 @@
/* This file is a template. The generated file is ldap-standard.h>
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
@@ -42,8 +43,8 @@ extern "C" {
#define LDAP_VERSION_MIN LDAP_VERSION1
#define LDAP_VERSION_MAX LDAP_VERSION3
#define LDAP_VENDOR_VERSION 500 /* version # * 100 */
#define LDAP_VENDOR_NAME "Iplanet A Sun|Netscape Alliance"
#define LDAP_VENDOR_VERSION {{LDAP_VENDOR_VERSION}} /* version # * 100 */
#define LDAP_VENDOR_NAME "{{LDAP_VENDOR_NAME}}"
/*
* The following will be an RFC number once the LDAP C API Internet Draft
* is published as a Proposed Standard RFC. For now we use 2000 + the

3
mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.client
View File

@@ -45,6 +45,7 @@ endif
IUTILOBJDEST = $(OBJDIR_NAME)
OBJS = $(addprefix $(IUTILOBJDEST)/, $(REALOBJS))
DISTHDIR = $(NSCP_DISTDIR)/public/ldap
HDIR = $(LDAP_SRC)/include
ifeq ($(OS_ARCH), WINNT)
@@ -56,7 +57,7 @@ endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(HDIR) -I$(INSTALLDIR)/include -I../../../../../dist/include
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include -I../../../../../dist/include
ifeq ($(HAVE_CCONF), 1)
INCLUDES += -I../libldap/
endif

3
mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
View File

@@ -97,6 +97,7 @@ endif
LDAPOBJDEST = $(OBJDIR_NAME)
OBJS = $(addprefix $(LDAPOBJDEST)/, $(REALOBJS))
DISTHDIR = $(NSCP_DISTDIR)/public/ldap
HDIR = $(LDAP_SRC)/include
ifeq ($(OS_ARCH), WINNT)
@@ -109,7 +110,7 @@ endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(HDIR) -I$(INSTALLDIR)/include \
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
-I../../../../../dist/include
DEFINES += $(DEFS)

2
mozilla/directory/c-sdk/ldap/libraries/libldap/nsprthreadtest.c
View File

@@ -25,7 +25,7 @@
#define NAME "cn=Directory Manager"
#define PASSWORD "secret99"
#define BASE "o=Airius.com"
#define BASE "dc=example,dc=com"
static int simplebind( LDAP *ld, char *msg, int tries );
static void search_thread( void * );

2
mozilla/directory/c-sdk/ldap/libraries/libldap/pthreadtest.c
View File

@@ -34,7 +34,7 @@
/* Authentication and search information. */
#define NAME "cn=Directory Manager"
#define PASSWORD "rtfm11111"
#define BASE "o=Airius.com"
#define BASE "dc=example,dc=com"
#define SCOPE LDAP_SCOPE_SUBTREE
static void *modify_thread();

3
mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client
View File

@@ -45,6 +45,7 @@ endif
PROBJDEST = $(OBJDIR_NAME)
OBJS = $(addprefix $(PROBJDEST)/, $(REALOBJS))
DISTHDIR = $(NSCP_DISTDIR)/public/ldap
HDIR = $(LDAP_SRC)/include
ifeq ($(OS_ARCH), WINNT)
@@ -58,7 +59,7 @@ endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(HDIR) -I$(INSTALLDIR)/include \
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
-I../../../../../dist/include
DEFINES += $(DEFS)

3
mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.client
View File

@@ -43,6 +43,7 @@ endif
SSLOBJDEST = $(OBJDIR_NAME)
OBJS = $(addprefix $(SSLOBJDEST)/, $(REALOBJS))
DISTHDIR = $(NSCP_DISTDIR)/public/ldap
HDIR = $(LDAP_SRC)/include
ifeq ($(OS_ARCH), WINNT)
@@ -56,7 +57,7 @@ endif
INSTALLDIR = $(DEPTH)/dist/$(OBJDIR_NAME)
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
INCLUDES += -I$(HDIR) -I$(INSTALLDIR)/include \
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
-I../../../../../dist/include \
-I../../../../../dist/public/security \
-I../../../../../dist/public/nss

21
mozilla/directory/c-sdk/package.mk
View File

@@ -36,32 +36,46 @@ ETCDIR = ../../dist/$(OBJDIR_NAME)/etc
EXPDIR = ldap/examples
DOCDIR = ldap/docs
# defaults
PKG_PRIVATE_HDRS=1
PKG_PRIVATE_LIBS=1
PKG_DEP_LIBS=1
all:: FORCE
$(NSINSTALL) -D $(INSTDIR)
@echo "Installing libraries"
$(NSINSTALL) -D $(INSTDIR)/lib
# Windows
ifeq ($(OS_ARCH), WINNT)
$(NSINSTALL) $(LIBDIR)/$(LDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(SSLDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(PRLDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(LBER_LIBNAME).lib $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(LDIF_LIBNAME).lib $(INSTDIR)/lib
ifeq ($(PKG_PRIVATE_LIBS),1)
$(NSINSTALL) $(LIBDIR)/$(IUTIL_LIBNAME).lib $(INSTDIR)/lib
endif
$(NSINSTALL) $(LIBDIR)/$(UTIL_LIBNAME).lib $(INSTDIR)/lib
ifeq ($(PKG_DEP_LIBS),1)
$(NSINSTALL) $(LIBDIR)/$(NSS_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(SSL_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(PLC_BASENAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(PLDS_BASENAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(NSPR_BASENAME).* $(INSTDIR)/lib
endif
# UNIX
else
$(NSINSTALL) $(LIBDIR)/lib$(LDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(LDAP_LIBNAME).$(DLL_SUFFIX) $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(SSLDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(PRLDAP_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(LDAP_LIBNAME).$(LIB_SUFFIX) $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(LBER_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(LDIF_LIBNAME).* $(INSTDIR)/lib
ifeq ($(PKG_PRIVATE_LIBS),1)
$(NSINSTALL) $(LIBDIR)/lib$(IUTIL_LIBNAME).* $(INSTDIR)/lib
endif
ifeq ($(PKG_DEP_LIBS),1)
$(NSINSTALL) $(LIBDIR)/lib$(NSS_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/lib$(SSL_LIBNAME).* $(INSTDIR)/lib
$(NSINSTALL) $(LIBDIR)/$(PLC_BASENAME).* $(INSTDIR)/lib
@@ -79,6 +93,7 @@ ifeq ($(OS_ARCH), HP-UX)
$(NSINSTALL) $(LIBDIR)/lib$(PURE32_LIBNAME).* $(INSTDIR)/lib
endif
endif
endif
endif
@echo "Installing tools"
$(NSINSTALL) -D $(INSTDIR)/tools
@@ -91,7 +106,9 @@ endif
@echo "Installing includes"
$(NSINSTALL) -D $(INSTDIR)/include
$(NSINSTALL) $(INCDIR)/disptmpl.h $(INSTDIR)/include
ifeq ($(PKG_PRIVATE_LIBS),1)
$(NSINSTALL) $(INCDIR)/iutil.h $(INSTDIR)/include
endif
$(NSINSTALL) $(INCDIR)/lber.h $(INSTDIR)/include
$(NSINSTALL) $(INCDIR)/ldap.h $(INSTDIR)/include
$(NSINSTALL) $(INCDIR)/ldap-standard.h $(INSTDIR)/include
@@ -102,6 +119,7 @@ endif
$(NSINSTALL) $(INCDIR)/ldap_ssl.h $(INSTDIR)/include
$(NSINSTALL) $(INCDIR)/srchpref.h $(INSTDIR)/include
ifeq ($(PKG_PRIVATE_HDRS),1)
@echo "Installing private include files"
$(NSINSTALL) -D $(INSTDIR)/include-private
$(NSINSTALL) -D $(INSTDIR)/include-private/liblber
@@ -110,6 +128,7 @@ endif
$(NSINSTALL) $(PRIVATEINCDIR)/portable.h $(INSTDIR)/include-private
$(NSINSTALL) $(PRIVATEINCDIR)/ldaprot.h $(INSTDIR)/include-private
$(NSINSTALL) $(PRIVATEINCDIR)/ldaplog.h $(INSTDIR)/include-private
endif
@echo "Installing etc files"
$(NSINSTALL) -D $(INSTDIR)/etc