diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2006-10-25 00:05:18 +0000 |
---|---|---|
committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-10-25 00:05:18 +0000 |
commit | 1f66bb691f8d0377334d109b7db19d7ec1971fb6 (patch) | |
tree | 5907e77bbc81d094f823b3838cfadf08fcb87215 /ldap/servers/slapd | |
parent | ce5079cf2029b380efd95f2f6e17b98df22927e5 (diff) | |
download | ds-1f66bb691f8d0377334d109b7db19d7ec1971fb6.tar.gz ds-1f66bb691f8d0377334d109b7db19d7ec1971fb6.tar.xz ds-1f66bb691f8d0377334d109b7db19d7ec1971fb6.zip |
Resolves: #210947
Summary: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup)
Comment #23
Diffstat (limited to 'ldap/servers/slapd')
-rw-r--r-- | ldap/servers/slapd/back-ldbm/Makefile | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/tools/dbscan.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/tools/ldclt/Makefile | 6 | ||||
-rw-r--r-- | ldap/servers/slapd/tools/rsearch/Makefile | 4 |
4 files changed, 7 insertions, 7 deletions
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 |