summaryrefslogtreecommitdiffstats
path: root/ldap/servers
diff options
context:
space:
mode:
Diffstat (limited to 'ldap/servers')
-rw-r--r--ldap/servers/plugins/acl/Makefile2
-rw-r--r--ldap/servers/plugins/chainingdb/Makefile2
-rw-r--r--ldap/servers/plugins/collation/Makefile4
-rw-r--r--ldap/servers/plugins/cos/Makefile4
-rw-r--r--ldap/servers/plugins/distrib/Makefile2
-rw-r--r--ldap/servers/plugins/http/Makefile4
-rw-r--r--ldap/servers/plugins/pam_passthru/Makefile2
-rw-r--r--ldap/servers/plugins/passthru/Makefile2
-rw-r--r--ldap/servers/plugins/presence/Makefile4
-rw-r--r--ldap/servers/plugins/pwdstorage/Makefile2
-rw-r--r--ldap/servers/plugins/referint/Makefile2
-rw-r--r--ldap/servers/plugins/replication/Makefile2
-rw-r--r--ldap/servers/plugins/retrocl/Makefile2
-rw-r--r--ldap/servers/plugins/rever/Makefile4
-rw-r--r--ldap/servers/plugins/roles/Makefile4
-rw-r--r--ldap/servers/plugins/statechange/Makefile4
-rw-r--r--ldap/servers/plugins/syntaxes/Makefile2
-rw-r--r--ldap/servers/plugins/uiduniq/Makefile2
-rw-r--r--ldap/servers/plugins/vattrsp_template/Makefile4
-rw-r--r--ldap/servers/plugins/views/Makefile4
-rw-r--r--ldap/servers/slapd/back-ldbm/Makefile2
-rw-r--r--ldap/servers/slapd/tools/dbscan.c2
-rw-r--r--ldap/servers/slapd/tools/ldclt/Makefile6
-rw-r--r--ldap/servers/slapd/tools/rsearch/Makefile4
-rw-r--r--ldap/servers/snmp/Makefile6
25 files changed, 39 insertions, 39 deletions
diff --git a/ldap/servers/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
index add44ac0..7e41bf63 100644
--- a/ldap/servers/plugins/acl/Makefile
+++ b/ldap/servers/plugins/acl/Makefile
@@ -49,7 +49,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libacl
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
index 9c4b7304..f530dc9c 100644
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ b/ldap/servers/plugins/chainingdb/Makefile
@@ -50,7 +50,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libcb
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
index 88f973b3..b3d52860 100644
--- a/ldap/servers/plugins/collation/Makefile
+++ b/ldap/servers/plugins/collation/Makefile
@@ -44,8 +44,8 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
-OBJDEST= $(OBJDIR)/lib/liblcoll
-LIBDIR= $(LIB_RELDIR)
+OBJDEST= $(OBJDIR)/lib/libcollation-plugin
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
index e5120050..46f6e91b 100644
--- a/ldap/servers/plugins/cos/Makefile
+++ b/ldap/servers/plugins/cos/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libcos
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ endif
COS_OBJS = cos.o cos_cache.o
OBJS = $(addprefix $(OBJDEST)/, $(COS_OBJS))
-COS_DLL = cos-plugin
+COS_DLL = libcos-plugin
INCLUDES += -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 3e948303..1f90b39c 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -48,7 +48,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libdistrib
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index f8b6badd..2fbd92f4 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -44,7 +44,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libhttpclient
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ HTTP_OBJS = http_client.o http_impl.o
OBJS = $(addprefix $(OBJDEST)/, $(HTTP_OBJS))
-HTTP_DLL = http-client-plugin
+HTTP_DLL = libhttp-client-plugin
INCLUDES += -I../../slapd -I../../../include
diff --git a/ldap/servers/plugins/pam_passthru/Makefile b/ldap/servers/plugins/pam_passthru/Makefile
index 553fe343..61c02319 100644
--- a/ldap/servers/plugins/pam_passthru/Makefile
+++ b/ldap/servers/plugins/pam_passthru/Makefile
@@ -49,7 +49,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libpam_passthru
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
index 4cfc8ec8..ca3c1cd2 100644
--- a/ldap/servers/plugins/passthru/Makefile
+++ b/ldap/servers/plugins/passthru/Makefile
@@ -50,7 +50,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libpassthru
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
index b8e971f6..4ba24c6d 100644
--- a/ldap/servers/plugins/presence/Makefile
+++ b/ldap/servers/plugins/presence/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libpresence
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ endif
PRESENCE_OBJS = presence.o
OBJS = $(addprefix $(OBJDEST)/, $(PRESENCE_OBJS))
-PRESENCE_DLL = presence-plugin
+PRESENCE_DLL = libpresence-plugin
INCLUDES += -I../http -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
index f97baa68..a53ebc92 100644
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ b/ldap/servers/plugins/pwdstorage/Makefile
@@ -49,7 +49,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libpwdstorage
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
index 0e53182f..8f7c4da2 100644
--- a/ldap/servers/plugins/referint/Makefile
+++ b/ldap/servers/plugins/referint/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/referint-plugin
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
index 40a1c61b..edee273c 100644
--- a/ldap/servers/plugins/replication/Makefile
+++ b/ldap/servers/plugins/replication/Makefile
@@ -50,7 +50,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/replication-plugin
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
index 21041d27..fcfb0728 100644
--- a/ldap/servers/plugins/retrocl/Makefile
+++ b/ldap/servers/plugins/retrocl/Makefile
@@ -49,7 +49,7 @@ NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/retrocl-plugin
BINDIR = $(LDAP_SERVER_RELDIR)
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
index 0362b910..8bb369d8 100644
--- a/ldap/servers/plugins/rever/Makefile
+++ b/ldap/servers/plugins/rever/Makefile
@@ -49,7 +49,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libdes
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(BUILD_ROOT)/ns_usepurify.mk
@@ -73,7 +73,7 @@ ifeq ($(ARCH), WINNT)
LIBREVER_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o)
endif
-REVER_DLL = des-plugin
+REVER_DLL = libdes-plugin
LIBREVER = $(addprefix $(LIBDIR)/, $(REVER_DLL).$(DLL_SUFFIX))
ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
index 184c920c..7c616ddd 100644
--- a/ldap/servers/plugins/roles/Makefile
+++ b/ldap/servers/plugins/roles/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libroles
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
ifndef INSTDIR
INSTDIR = c:/netscape/server4/
endif
@@ -61,7 +61,7 @@ endif
ROLES_OBJS = roles_plugin.o roles_cache.o
OBJS = $(addprefix $(OBJDEST)/, $(ROLES_OBJS))
-ROLES_DLL = roles-plugin
+ROLES_DLL = libroles-plugin
INCLUDES += -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
index f24b14a3..59bf9df5 100644
--- a/ldap/servers/plugins/statechange/Makefile
+++ b/ldap/servers/plugins/statechange/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libstatechange
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ endif
STATECHANGE_OBJS = statechange.o
OBJS = $(addprefix $(OBJDEST)/, $(STATECHANGE_OBJS))
-STATECHANGE_DLL = statechange-plugin
+STATECHANGE_DLL = libstatechange-plugin
INCLUDES += -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
index 0ea6af68..76fbbc1a 100644
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ b/ldap/servers/plugins/syntaxes/Makefile
@@ -49,7 +49,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libsyntax
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsconfig.mk
include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/servers/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
index 911f1757..b57d32a0 100644
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ b/ldap/servers/plugins/uiduniq/Makefile
@@ -50,7 +50,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libuidunique
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
SHAREDLIB = $(OBJDIR)/lib/shared/utils.o
include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
index a090e2a4..86c092ee 100644
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ b/ldap/servers/plugins/vattrsp_template/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libvattrsp
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ endif
VATTRSP_OBJS = vattrsp.o
OBJS = $(addprefix $(OBJDEST)/, $(VATTRSP_OBJS))
-VATTRSP_DLL = vattrsp-plugin
+VATTRSP_DLL = libvattrsp-plugin
INCLUDES += -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
index bdc0d0e7..e232ef24 100644
--- a/ldap/servers/plugins/views/Makefile
+++ b/ldap/servers/plugins/views/Makefile
@@ -45,7 +45,7 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/lib/libviews
-LIBDIR = $(LIB_RELDIR)
+LIBDIR = $(LDAP_PLUGIN_RELDIR)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
@@ -58,7 +58,7 @@ endif
VIEWS_OBJS = views.o
OBJS = $(addprefix $(OBJDEST)/, $(VIEWS_OBJS))
-VIEWS_DLL = views-plugin
+VIEWS_DLL = libviews-plugin
INCLUDES += -I../../slapd -I../../../include
CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index c4a174c1..6ae6c924 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -178,7 +178,7 @@ ifeq ($(ARCH), WINNT)
endif
dummy:
- -@echo LDAP_LIBDIR = $(LDAP_LIBDIR)
+ -@echo LDAP_LIBDIR = $(LDAP_LIB_RELDIR)
-@echo LDAP_LIBBACK_LDBM_LIBDIR = $(LDAP_LIBBACK_LDBM_LIBDIR)
-@echo LIB_RELDIR = $(LIB_RELDIR)
-@echo LDAP_LIBBACK_LDBM_DLLDIR = $(LDAP_LIBBACK_LDBM_DLLDIR)
diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index b3f610ef..178762ec 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -745,7 +745,7 @@ static void usage(char *argv0)
printf(" -r display the conents of idl\n");
printf(" -s Summary of index counts\n");
printf(" sample usages:\n");
- printf(" # set <serverroot>/bin/slapd/server:<serverroot>/shared/lib in the library path\n");
+ printf(" # set <prefix>/usr/lib/<brand-ds>:<prefix>/usr/lib:/usr/lib in the library path\n");
printf(" # dump the entry file\n");
printf(" %s -f id2entry.db\n", argv0);
printf(" # display index keys in cn.db4\n");
diff --git a/ldap/servers/slapd/tools/ldclt/Makefile b/ldap/servers/slapd/tools/ldclt/Makefile
index d4a636a9..5209c952 100644
--- a/ldap/servers/slapd/tools/ldclt/Makefile
+++ b/ldap/servers/slapd/tools/ldclt/Makefile
@@ -47,9 +47,9 @@
LDAP_SRC = ../../../..
BUILD_ROOT = ../../../../..
-OBJDEST = $(OBJDIR)/servers/tools/obj
-BINDIR = $(RELDIR)/shared/bin
-DATDIR = $(RELDIR)/shared/data
+OBJDEST = $(OBJDIR)/servers/tools/obj
+BINDIR = $(RELDIR)/usr/bin
+DATDIR = $(RELDIR)/usr/share/data
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/slapd/tools/rsearch/Makefile b/ldap/servers/slapd/tools/rsearch/Makefile
index c265489f..0fad852c 100644
--- a/ldap/servers/slapd/tools/rsearch/Makefile
+++ b/ldap/servers/slapd/tools/rsearch/Makefile
@@ -49,8 +49,8 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/servers/tools/obj
-BINDIR = $(RELDIR)/shared/bin
-DATDIR = $(RELDIR)/shared/data
+BINDIR = $(RELDIR)/usr/bin
+DATDIR = $(RELDIR)/usr/share/$(DS_BRAND)-ds/data
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index b34f8f95..d8a1d40c 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -89,9 +89,9 @@ ifneq ($(ARCH), WINNT)
EXTRA_LIBS += $(NETSNMP_LINK) $(EXTERNAL_AGENT_LIBS)
endif
-# the redhat-directory.mib goes in the plugins/snmp directory, and the other mib like
-# files go in the plugins/snmp/mibs directory
-MIB_DEST_DIR = $(RELDIR)/plugins/snmp
+# the redhat-directory.mib goes in the _datadir/brand-ds/plugins/snmp directory, and the other mib like
+# files go in the _datadir/brand-ds/plugins/snmp/mibs directory
+MIB_DEST_DIR = $(RELDIR)/$(DS_PLUGINDIR)/snmp
MIB_SRC_FILES =redhat-directory.mib
MIBS_DEST_DIR = $(MIB_DEST_DIR)/mibs
MIBS_SRC_FILES = NETWORK-SERVICES-MIB.txt \