upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified build environment to correctly support bin,sbin,libexec,etc

Browse source 
and setting of variables from Make-platform with defaults in Make-common.
This commit is contained in:
Kurt Zeilenga 1998-08-19 18:19:39 +00:00
parent 079f21c3ac
commit adc2134f03
27 changed files with 216 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Make-common
View file

@ -20,7 +20,6 @@
############################################################################# #############################################################################
## LDAP install paths ## ## LDAP install paths ##
############################################################################# #############################################################################
#
# by default, everything is installed below INSTROOT # by default, everything is installed below INSTROOT
# config files, etc. are put in ETCDIR # config files, etc. are put in ETCDIR
# include files get put in INCLUDEDIR # include files get put in INCLUDEDIR
@ -29,21 +28,20 @@
# programs end-users will run are put in BINDIR # programs end-users will run are put in BINDIR
# programs sysadmins will run are put in SBINDIR # programs sysadmins will run are put in SBINDIR
# servers are put in LIBEXECDIR # servers are put in LIBEXECDIR
# pid/args files are put in RUNDIR
# #
PREFIX?=/usr/local # Per platform defaults override these.
INSTROOT?=${PREFIX}
ETCDIR?= $(INSTROOT)/etc/ldap
INCLUDEDIR?= $(INSTROOT)/include
LIBDIR?= $(INSTROOT)/lib
MANDIR?= $(INSTROOT)/man
BINDIR?= $(INSTROOT)/bin
SBINDIR?=$(INSTROOT)/sbin
LIBEXECDIR?=$(INSTROOT)/libexec
# #
# if you want things to run in a different directory from where they LDAP_PREFIX?= /usr/local
# are installed, set this accordingly (this path gets compiled into a LDAP_INSTROOT?= $(LDAP_PREFIX)
# few binaries). otherwise, leave it alone. LDAP_ETCDIR?= $(LDAP_INSTROOT)/etc/ldap
RUNTIMEETCDIR?= $(ETCDIR) LDAP_INCDIR?= $(LDAP_INSTROOT)/include
LDAP_LIBDIR?= $(LDAP_INSTROOT)/lib
LDAP_MANDIR?= $(LDAP_INSTROOT)/man
LDAP_BINDIR?= $(LDAP_INSTROOT)/bin
LDAP_SBINDIR?=$(LDAP_INSTROOT)/sbin
LDAP_LIBEXECDIR?= $(LDAP_INSTROOT)/libexec
LDAP_RUNDIR?= $(LDAP_ETCDIR)
############################################################################# #############################################################################
## General compiler options ## ## General compiler options ##
@ -159,12 +157,16 @@ LDBMLIB?=
#THREADS?=-DNO_THREADS #THREADS?=-DNO_THREADS
#THREADSLIB?= #THREADSLIB?=
#
# Locations of auxilary programs # Locations of auxilary programs
# (excepts to below are generally defined in Make-platform) # (excepts to below are generally defined in Make-platform)
SENDMAIL?=/usr/lib/sendmail LDAP_SENDMAIL?=/usr/lib/sendmail
EDITOR?=/usr/ucb/vi LDAP_EDITOR?=/usr/ucb/vi
FINGER?=/usr/ucb/finger LDAP_FINGER?=/usr/ucb/finger
# For generation of compressed man pages
# (excepts to below are generally defined in Make-platform)
MANCOMPRESS?=cat
MANCOMPRESSSUFFIX?=
############################################################################# #############################################################################
## The following options are used by the xax500 client. If you haven't ## ## The following options are used by the xax500 client. If you haven't ##

6
build/platforms/freebsd-gcc/Make-platform
View file

@ -14,6 +14,12 @@ EDITOR=/usr/bin/vi
FINGER=/usr/bin/finger FINGER=/usr/bin/finger
SENDMAIL=/usr/sbin/sendmail SENDMAIL=/usr/sbin/sendmail
RUNDIR=/var/run
MANCOMPRESS=gzip
MANCOMPRESSSUFFIX=.gz
# #
# LDAP has a problem with the idea of implicit vs. explicit yields # LDAP has a problem with the idea of implicit vs. explicit yields
# in call conversion threading packages, like the MIT pthreads # in call conversion threading packages, like the MIT pthreads

10
clients/fax500/Make-template
View file

@ -53,12 +53,12 @@ fax5version.c: main.o faxtotpc.o $(LDIR)/libldap.a
< Version.c > $@ ) < Version.c > $@ )
install: rp500 xrpcomp fax500 FORCE install: rp500 xrpcomp fax500 FORCE
-$(MKDIR) -p $(ETCDIR) $(BINDIR) -$(MKDIR) -p $(LDAP_ETCDIR) $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(LDAP_LIBEXECDIR)
$(SED) -e 's%ETCDIR%$(LIBEXECDIR)%' xrpcomp > /tmp/xrpcomp.tmp $(SED) -e 's%ETCDIR%$(LDAP_LIBEXECDIR)%' xrpcomp > /tmp/xrpcomp.tmp
$(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(LDAP_BINDIR)/xrpcomp
$(RM) /tmp/xrpcomp.tmp $(RM) /tmp/xrpcomp.tmp
$(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(LDAP_LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

4
clients/finger/Make-template
View file

@ -42,8 +42,8 @@ version.c: $(OBJS) $(LDIR)/libldap.a
< Version.c > $@) < Version.c > $@)
install: in.xfingerd FORCE install: in.xfingerd FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(LDAP_LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

10
clients/gopher/Make-template
View file

@ -56,11 +56,11 @@ gwversion.c: go500gw.o detach.o setproctitle.o $(DLIBS)
< Versiongw.c > $@) < Versiongw.c > $@)
install: go500 go500gw go500gw.help FORCE install: go500 go500gw go500gw.help FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(LDAP_ETCDIR) $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 go500 $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 go500 $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(LDAP_LIBEXECDIR)
-$(MV) $(ETCDIR)/go500gw.help $(ETCDIR)/go500gw.help- -$(MV) $(LDAP_ETCDIR)/go500gw.help $(LDAP_ETCDIR)/go500gw.help-
$(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(LDAP_ETCDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

4
clients/mail500/Make-template
View file

@ -41,8 +41,8 @@ version.c: $(OBJS) $(LDIR)/libldap/libldap.a
< Version.c > $@) < Version.c > $@)
install: mail500 FORCE install: mail500 FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(LDAP_LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

6
clients/rcpt500/Make-template
View file

@ -39,9 +39,9 @@ version.c: $(OBJS) $(LDIR)/libldap.a
< Version.c > $@) < Version.c > $@)
install: rcpt500 rcpt500.help FORCE install: rcpt500 rcpt500.help FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(LDAP_ETCDIR) $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(LDAP_ETCDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

14
clients/tools/Make-template
View file

@ -79,13 +79,13 @@ ldrversion.c: ldapmodrdn.o
< Versionldr.c > $@) < Versionldr.c > $@)
install: ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd FORCE install: ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd FORCE
-$(MKDIR) -p $(BINDIR) -$(MKDIR) -p $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(BINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(BINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(BINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(BINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(LDAP_BINDIR)
$(RM) $(BINDIR)/ldapadd $(RM) $(LDAP_BINDIR)/ldapadd
$(HARDLN) $(BINDIR)/ldapmodify $(BINDIR)/ldapadd $(HARDLN) $(LDAP_BINDIR)/ldapmodify $(LDAP_BINDIR)/ldapadd
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

10
clients/ud/Make-template
View file

@ -29,8 +29,8 @@ OBJS= main.o find.o mod.o print.o auth.o util.o help.o\
HDRS= ud.h HDRS= ud.h
INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG) INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG)
DEFINES= $(DEFS) -DDEBUG -DCONFIG_FILE=\"$(RUNTIMEETCDIR)/ud.conf\" \ DEFINES= $(DEFS) -DDEBUG -DCONFIG_FILE=\"$(LDAP_ETCDIR)/ud.conf\" \
-DLDAP_FRIENDLY_MAP_FILE=\"$(RUNTIMEETCDIR)/ldapfriendly\" -DLDAP_FRIENDLY_MAP_FILE=\"$(LDAP_ETCDIR)/ldapfriendly\"
TERMLIB= -ltermcap TERMLIB= -ltermcap
CFLAGS= ${INCLUDES} ${DEFINES} ${ACFLAGS} CFLAGS= ${INCLUDES} ${DEFINES} ${ACFLAGS}
@ -53,9 +53,9 @@ version.c: ${OBJS} $(LDIR)/libldap/libldap.a
< Version.c > $@) < Version.c > $@)
install: ud FORCE install: ud FORCE
-$(MKDIR) -p $(BINDIR) -$(MKDIR) -p $(LDAP_BINDIR)
-mv -f ${BINDIR}/ud ${BINDIR}/ud- -mv -f $(LDAP_BINDIR)/ud $(LDAP_BINDIR)/ud-
$(INSTALL) $(INSTALLFLAGS) -m 775 ud ${BINDIR} $(INSTALL) $(INSTALLFLAGS) -m 775 ud $(LDAP_BINDIR)
depend: FORCE depend: FORCE
$(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS)

14
contrib/saucer/Make-template
View file

@ -24,16 +24,16 @@ unprotoize: $(SRCS)
unprotoize -c "$(CFLAGS)" $(SRCS) unprotoize -c "$(CFLAGS)" $(SRCS)
install: saucer FORCE install: saucer FORCE
-$(MKDIR) -p $(BINDIR) -$(MKDIR) -p $(LDAP_BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 saucer $(BINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 saucer $(LDAP_BINDIR)
-$(MKDIR) -p $(INSTMAN) -$(MKDIR) -p $(LDAP_MANDIR)
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERFILE)`; \ VERSION=`$(CAT) $(VERFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e 's%ETCDIR%$(ETCDIR)%' -e "s%LDVERSION%$$VERSION%" \ $(SED) -e 's%ETCDIR%$(LDAP_ETCDIR)%' -e "s%LDVERSION%$$VERSION%" \
$$page > $$TMPMAN; \ $$page | $(MANCOMPRESS) > $$TMPMAN; \
echo "installing $(INSTMAN)/$$page"; \ echo "installing $(INSTMAN)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTMAN)/$$page; \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(LDAP_INSTMAN)/$$page$(MANCOMPRESSSUFFIX); \
done; \ done; \
$(RM) $$TMPMAN $(RM) $$TMPMAN

20
doc/man/man1/Make-template
View file

@ -15,28 +15,30 @@
LDAPSRC= ../../.. LDAPSRC= ../../..
SECT=1 SECT=1
INSTDIR=$(MANDIR)/man$(SECT) INSTDIR=$(LDAP_MANDIR)/man$(SECT)
VERSIONFILE = $(LDAPSRC)/build/version VERSIONFILE = $(LDAPSRC)/build/version
all: FORCE all: FORCE
install: FORCE install: FORCE
-$(MKDIR) -p $(INSTDIR) -$(MKDIR) -p $(INSTDIR)
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \ -e 's%ETCDIR%$(LDAP_ETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \ -e 's%SBINDIR%$(LDAP_SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \ -e 's%BINDIR%$(LDAP_BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \ -e 's%LIBEXECDIR%$(LDAP_LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page | $(MANCOMPRESS) > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(RM) $(INSTDIR)/$$page $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
if [ -f "$$page.links" ]; then \ if [ -f "$$page.links" ]; then \
for link in `$(CAT) $$page.links`; do \ for link in `$(CAT) $$page.links`; do \
echo "installing $(INSTDIR)/$$link as link to $$page"; \ echo "installing $(INSTDIR)/$$link as link to $$page"; \
ln -sf $$page.gz $(INSTDIR)/$$link.gz; \ $(RM) $(INSTDIR)/$$link $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
ln -sf $$page$(MANCOMPRESSSUFFIX) $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
done; \ done; \
fi; \ fi; \
done; \ done; \

20
doc/man/man3/Make-template
View file

@ -15,28 +15,30 @@
LDAPSRC= ../../.. LDAPSRC= ../../..
SECT=3 SECT=3
INSTDIR=$(MANDIR)/man$(SECT) INSTDIR=$(LDAP_MANDIR)/man$(SECT)
VERSIONFILE = $(LDAPSRC)/build/version VERSIONFILE = $(LDAPSRC)/build/version
all: FORCE all: FORCE
install: FORCE install: FORCE
-$(MKDIR) -p $(INSTDIR) -$(MKDIR) -p $(INSTDIR)
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \ -e 's%ETCDIR%$(LDAP_ETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \ -e 's%SBINDIR%$(LDAP_SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \ -e 's%BINDIR%$(LDAP_BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \ -e 's%LIBEXECDIR%$(LDAP_LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page | $(MANCOMPRESS) > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(RM) $(INSTDIR)/$$page $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
if [ -f "$$page.links" ]; then \ if [ -f "$$page.links" ]; then \
for link in `$(CAT) $$page.links`; do \ for link in `$(CAT) $$page.links`; do \
echo "installing $(INSTDIR)/$$link as link to $$page"; \ echo "installing $(INSTDIR)/$$link as link to $$page"; \
ln -sf $$page.gz $(INSTDIR)/$$link.gz; \ $(RM) $(INSTDIR)/$$link $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
ln -sf $$page$(MANCOMPRESSSUFFIX) $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
done; \ done; \
fi; \ fi; \
done; \ done; \

20
doc/man/man5/Make-template
View file

@ -15,28 +15,30 @@
LDAPSRC= ../../.. LDAPSRC= ../../..
SECT=5 SECT=5
INSTDIR=$(MANDIR)/man$(SECT) INSTDIR=$(LDAP_MANDIR)/man$(SECT)
VERSIONFILE = $(LDAPSRC)/build/version VERSIONFILE = $(LDAPSRC)/build/version
all: FORCE all: FORCE
install: FORCE install: FORCE
-$(MKDIR) -p $(INSTDIR) -$(MKDIR) -p $(INSTDIR)
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \ -e 's%ETCDIR%$(LDAP_ETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \ -e 's%SBINDIR%$(LDAP_SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \ -e 's%BINDIR%$(LDAP_BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \ -e 's%LIBEXECDIR%$(LDAP_LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page | $(MANCOMPRESS) > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(RM) $(INSTDIR)/$$page $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
if [ -f "$$page.links" ]; then \ if [ -f "$$page.links" ]; then \
for link in `$(CAT) $$page.links`; do \ for link in `$(CAT) $$page.links`; do \
echo "installing $(INSTDIR)/$$link as link to $$page"; \ echo "installing $(INSTDIR)/$$link as link to $$page"; \
ln -sf $$page.gz $(INSTDIR)/$$link.gz; \ $(RM) $(INSTDIR)/$$link $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
ln -sf $$page$(MANCOMPRESSSUFFIX) $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
done; \ done; \
fi; \ fi; \
done; \ done; \

20
doc/man/man8/Make-template
View file

@ -15,28 +15,30 @@
LDAPSRC= ../../.. LDAPSRC= ../../..
SECT=8 SECT=8
INSTDIR=$(MANDIR)/man$(SECT) INSTDIR=$(LDAP_MANDIR)/man$(SECT)
VERSIONFILE = $(LDAPSRC)/build/version VERSIONFILE = $(LDAPSRC)/build/version
all: FORCE all: FORCE
install: FORCE install: FORCE
-$(MKDIR) -p $(INSTDIR) -$(MKDIR) -p $(INSTDIR)
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \ -e 's%ETCDIR%$(LDAP_ETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \ -e 's%SBINDIR%$(LDAP_SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \ -e 's%BINDIR%$(LDAP_BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \ -e 's%LIBEXECDIR%$(LDAP_LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page | $(MANCOMPRESS) > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(RM) $(INSTDIR)/$$page $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX) ; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page$(MANCOMPRESSSUFFIX); \
if [ -f "$$page.links" ]; then \ if [ -f "$$page.links" ]; then \
for link in `$(CAT) $$page.links`; do \ for link in `$(CAT) $$page.links`; do \
echo "installing $(INSTDIR)/$$link as link to $$page"; \ echo "installing $(INSTDIR)/$$link as link to $$page"; \
ln -sf $$page.gz $(INSTDIR)/$$link.gz; \ $(RM) $(INSTDIR)/$$link $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX) ; \
ln -sf $$page$(MANCOMPRESSSUFFIX) $(INSTDIR)/$$link$(MANCOMPRESSSUFFIX); \
done; \ done; \
fi; \ fi; \
done; \ done; \

2
doc/man/man8/slapd.8
View file

@ -78,7 +78,7 @@ the LDAP databases defined in the default config file, just type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/slapd LIBEXECDIR/slapd
.ft .ft
.fi .fi
.LP .LP

23
include/Make-template
View file

@ -32,22 +32,23 @@ ldapconfig.h: ldapconfig.h.edit Makefile
echo " */ " >> $@; \ echo " */ " >> $@; \
echo "" >> $@; \ echo "" >> $@; \
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' \ $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' \
-e 's;%SBINDIR%;$(SBINDIR);' \ -e 's;%SBINDIR%;$(LDAP_SBINDIR);' \
-e 's;%LIBEXECDIR%;$(LIBEXECDIR);' \ -e 's;%LIBEXECDIR%;$(LDAP_LIBEXECDIR);' \
-e 's;%EDITOR%;$(EDITOR);' \ -e 's;%RUNDIR%;$(LDAP_RUNDIR);' \
-e 's;%FINGER%;$(FINGER);' \ -e 's;%EDITOR%;$(LDAP_EDITOR);' \
-e 's;%SENDMAIL%;$(SENDMAIL);' \ -e 's;%FINGER%;$(LDAP_FINGER);' \
-e 's;%SENDMAIL%;$(LDAP_SENDMAIL);' \
ldapconfig.h.edit >> $@; \ ldapconfig.h.edit >> $@; \
$(CHMOD) 444 $@ $(CHMOD) 444 $@
install: all FORCE install: all FORCE
-$(MKDIR) -p $(INCLUDEDIR) -$(MKDIR) -p $(INCLUDEDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(LDAP_INCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(LDAP_INCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(LDAP_INCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 proto-ldap.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 proto-ldap.h $(LDAP_INCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(LDAP_INCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(INCLUDEDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(LDAP_INCDIR)
depend: FORCE depend: FORCE

4
include/ldapconfig.h.edit
View file

@ -255,9 +255,9 @@ Please try again later.\r\n"
/* default timelimit to spend on a search */ /* default timelimit to spend on a search */
#define SLAPD_DEFAULT_TIMELIMIT 3600 #define SLAPD_DEFAULT_TIMELIMIT 3600
/* location of the slapd pid file */ /* location of the slapd pid file */
#define SLAPD_PIDFILE "%ETCDIR%/slapd.pid" #define SLAPD_PIDFILE "%RUNDIR%/slapd.pid"
/* location of the slapd args file */ /* location of the slapd args file */
#define SLAPD_ARGSFILE "%ETCDIR%/slapd.args" #define SLAPD_ARGSFILE "%RUNDIR%/slapd.args"
/* dn of the special "monitor" entry */ /* dn of the special "monitor" entry */
#define SLAPD_MONITOR_DN "cn=monitor" #define SLAPD_MONITOR_DN "cn=monitor"
/* dn of the special "config" entry */ /* dn of the special "config" entry */

1
include/lthread.h
View file

@ -173,6 +173,7 @@ typedef cond_t pthread_cond_t;
#define _THREAD #define _THREAD
#include <pthread.h> #include <pthread.h>
#include <sched.h>
#define pthread_mutexattr_default NULL #define pthread_mutexattr_default NULL
#define pthread_condattr_default NULL #define pthread_condattr_default NULL

6
libraries/liblber/Make-template
View file

@ -53,10 +53,10 @@ version.c: $(OBJS)
< Version.c > $@) < Version.c > $@)
install: liblber.a FORCE install: liblber.a FORCE
-$(MKDIR) -p $(LIBDIR) -$(MKDIR) -p $(LDAP_LIBDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 liblber.a $(LIBDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 liblber.a $(LDAP_LIBDIR)
@if [ ! -z "$(RANLIB)" ]; then \ @if [ ! -z "$(RANLIB)" ]; then \
(cd /tmp; $(RANLIB) $(LIBDIR)/liblber.a) \ (cd /tmp; $(RANLIB) $(LDAP_LIBDIR)/liblber.a) \
fi fi
lint: FORCE lint: FORCE

28
libraries/libldap/Make-template
View file

@ -31,8 +31,8 @@ OBJS = bind.o open.o result.o error.o compare.o search.o \
HDIR = ../../include HDIR = ../../include
INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG) INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG)
DEFINES = $(DEFS) -DFILTERFILE="\"$(RUNTIMEETCDIR)/ldapfilter.conf\"" \ DEFINES = $(DEFS) -DFILTERFILE="\"$(LDAP_ETCDIR)/ldapfilter.conf\"" \
-DTEMPLATEFILE="\"$(RUNTIMEETCDIR)/ldaptemplates.conf\"" -DTEMPLATEFILE="\"$(LDAP_ETCDIR)/ldaptemplates.conf\""
CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS)
LIBS = -L. -L../liblber -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) LIBS = -L. -L../liblber -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS)
@ -62,20 +62,20 @@ version.c: $(OBJS)
< Version.c > $@) < Version.c > $@)
install: libldap.a ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf FORCE install: libldap.a ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf FORCE
-$(MKDIR) -p $(LIBDIR) -$(MKDIR) -p $(LDAP_LIBDIR) $(LDAP_ETCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 libldap.a $(LIBDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 libldap.a $(LDAP_LIBDIR)
@if [ ! -z "$(RANLIB)" ]; then \ @if [ ! -z "$(RANLIB)" ]; then \
(cd /tmp; $(RANLIB) $(LIBDIR)/libldap.a) \ (cd /tmp; $(RANLIB) $(LDAP_LIBDIR)/libldap.a) \
fi fi
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(LDAP_ETCDIR)
-$(MV) $(ETCDIR)/ldapfriendly $(ETCDIR)/ldapfriendly- -$(MV) $(LDAP_ETCDIR)/ldapfriendly $(LDAP_ETCDIR)/ldapfriendly-
$(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(LDAP_ETCDIR)
-$(MV) $(ETCDIR)/ldapfilter.conf $(ETCDIR)/ldapfilter.conf- -$(MV) $(LDAP_ETCDIR)/ldapfilter.conf $(LDAP_ETCDIR)/ldapfilter.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 ldapfilter.conf $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfilter.conf $(LDAP_ETCDIR)
-$(MV) $(ETCDIR)/ldaptemplates.conf $(ETCDIR)/ldaptemplates.conf- -$(MV) $(LDAP_ETCDIR)/ldaptemplates.conf $(LDAP_ETCDIR)/ldaptemplates.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 ldaptemplates.conf $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 ldaptemplates.conf $(LDAP_ETCDIR)
-$(MV) $(ETCDIR)/ldapsearchprefs.conf $(ETCDIR)/ldapsearchprefs.conf- -$(MV) $(LDAP_ETCDIR)/ldapsearchprefs.conf $(LDAP_ETCDIR)/ldapsearchprefs.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 ldapsearchprefs.conf $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 ldapsearchprefs.conf $(LDAP_ETCDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

4
libraries/liblthread/thread.c
View file

@ -491,7 +491,9 @@ pthread_kill( pthread_t tid, int sig )
#if defined ( POSIX_THREADS ) #if defined ( POSIX_THREADS )
void p_thread_yield( void ) #include <sched.h>
void pthread_yield( void )
{ {
sched_yield(); sched_yield();
} }

6
servers/ldapd/Make-template
View file

@ -71,10 +71,10 @@ install: FORCE
echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \ echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \
fi fi
install-ldapd: $(LIBEXECDIR) $(LIBEXECDIR)/ldapd install-ldapd: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/ldapd
$(LIBEXECDIR)/ldapd: ldapd $(LDAP_LIBEXECDIR)/ldapd: ldapd
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

30
servers/slapd/Make-template
View file

@ -100,27 +100,27 @@ version.c: libbackends.a $(OBJS) $(LDIR)/liblber/liblber.a \
-e "s|%VERSION%|$${v}|" \ -e "s|%VERSION%|$${v}|" \
< Version.c > $@) < Version.c > $@)
install: all $(LIBEXECDIR) $(LIBEXECDIR)/slapd \ install: all $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slapd \
$(ETCDIR) $(ETCDIR)/slapd.conf \ $(LDAP_ETCDIR) $(LDAP_ETCDIR)/slapd.conf \
$(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.oc.conf \ $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.oc.conf \
install-tools install-tools
$(LIBEXECDIR)/slapd: slapd $(LDAP_LIBEXECDIR)/slapd: slapd
$(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LDAP_LIBEXECDIR)
$(ETCDIR)/slapd.conf: slapd.conf $(LDAP_ETCDIR)/slapd.conf: slapd.conf
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' slapd.conf > /tmp/slapd.$$ $(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' slapd.conf > /tmp/slapd.$$
-$(MV) $(ETCDIR)/slapd.conf $(ETCDIR)/slapd.conf- -$(MV) $(LDAP_ETCDIR)/slapd.conf $(LDAP_ETCDIR)/slapd.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(ETCDIR)/slapd.conf $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(LDAP_ETCDIR)/slapd.conf
$(RM) -f /tmp/slapd.$$ $(RM) -f /tmp/slapd.$$
$(ETCDIR)/slapd.at.conf: slapd.at.conf $(LDAP_ETCDIR)/slapd.at.conf: slapd.at.conf
-$(MV) $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.at.conf- -$(MV) $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.at.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(LDAP_ETCDIR)
$(ETCDIR)/slapd.oc.conf: slapd.oc.conf $(LDAP_ETCDIR)/slapd.oc.conf: slapd.oc.conf
-$(MV) $(ETCDIR)/slapd.oc.conf $(ETCDIR)/slapd.oc.conf- -$(MV) $(LDAP_ETCDIR)/slapd.oc.conf $(LDAP_ETCDIR)/slapd.oc.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(LDAP_ETCDIR)
install-tools: FORCE install-tools: FORCE
(cd tools; $(MAKE) $(MFLAGS) install) (cd tools; $(MAKE) $(MFLAGS) install)

40
servers/slapd/daemon.c
View file

@ -149,16 +149,17 @@ slapd_daemon(
} }
(void) SIGNAL( SIGPIPE, SIG_IGN ); (void) SIGNAL( SIGPIPE, SIG_IGN );
#ifdef SIGSTKFLT #ifdef linux
/*
* LinuxThreads are implemented using SIGUSR1/USR2,
* so we'll use SIGSTKFLT and SIGUNUSED
*/
(void) SIGNAL( SIGSTKFLT, (void *) do_nothing ); (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
#else
(void) SIGNAL( SIGUSR1, (void *) do_nothing );
#endif
#ifdef SIGUNUSED
(void) SIGNAL( SIGUNUSED, (void *) set_shutdown ); (void) SIGNAL( SIGUNUSED, (void *) set_shutdown );
#else #else /* !linux */
(void) SIGNAL( SIGUSR1, (void *) do_nothing );
(void) SIGNAL( SIGUSR2, (void *) set_shutdown ); (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
#endif #endif /* !linux */
(void) SIGNAL( SIGTERM, (void *) set_shutdown ); (void) SIGNAL( SIGTERM, (void *) set_shutdown );
(void) SIGNAL( SIGINT, (void *) set_shutdown ); (void) SIGNAL( SIGINT, (void *) set_shutdown );
(void) SIGNAL( SIGHUP, (void *) set_shutdown ); (void) SIGNAL( SIGHUP, (void *) set_shutdown );
@ -420,16 +421,17 @@ set_shutdown()
{ {
Debug( LDAP_DEBUG_ANY, "slapd got shutdown signal\n", 0, 0, 0 ); Debug( LDAP_DEBUG_ANY, "slapd got shutdown signal\n", 0, 0, 0 );
slapd_shutdown = 1; slapd_shutdown = 1;
#ifdef SIGSTKFLT #ifdef linux
/*
* LinuxThreads are implemented using SIGUSR1/USR2,
* so we'll use SIGSTKFLT and SIGUNUSED
*/
pthread_kill( listener_tid, SIGSTKFLT ); pthread_kill( listener_tid, SIGSTKFLT );
#else
pthread_kill( listener_tid, SIGUSR1 );
#endif
#ifdef SIGUNUSED
(void) SIGNAL( SIGUNUSED, (void *) set_shutdown ); (void) SIGNAL( SIGUNUSED, (void *) set_shutdown );
#else #else /* !linux */
pthread_kill( listener_tid, SIGUSR1 );
(void) SIGNAL( SIGUSR2, (void *) set_shutdown ); (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
#endif #endif /* !linux */
(void) SIGNAL( SIGTERM, (void *) set_shutdown ); (void) SIGNAL( SIGTERM, (void *) set_shutdown );
(void) SIGNAL( SIGINT, (void *) set_shutdown ); (void) SIGNAL( SIGINT, (void *) set_shutdown );
(void) SIGNAL( SIGHUP, (void *) set_shutdown ); (void) SIGNAL( SIGHUP, (void *) set_shutdown );
@ -439,9 +441,13 @@ static void
do_nothing() do_nothing()
{ {
Debug( LDAP_DEBUG_TRACE, "slapd got do_nothing signal\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "slapd got do_nothing signal\n", 0, 0, 0 );
#ifdef SIGSTKFLT #ifdef linux
/*
* LinuxThreads are implemented using SIGUSR1/USR2,
* so we'll use SIGSTKFLT and SIGUNUSED
*/
(void) SIGNAL( SIGSTKFLT, (void *) do_nothing ); (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
#else #else /* !linux */
(void) SIGNAL( SIGUSR1, (void *) do_nothing ); (void) SIGNAL( SIGUSR1, (void *) do_nothing );
#endif #endif /* !linux */
} }

6
servers/slapd/result.c
View file

@ -121,11 +121,11 @@ send_ldap_result2(
pthread_mutex_lock( &active_threads_mutex ); pthread_mutex_lock( &active_threads_mutex );
active_threads--; active_threads--;
conn->c_writewaiter = 1; conn->c_writewaiter = 1;
#ifdef SIGSTKFLT #ifdef linux
pthread_kill( listener_tid, SIGSTKFLT ); pthread_kill( listener_tid, SIGSTKFLT );
#else #else /* !linux */
pthread_kill( listener_tid, SIGUSR1 ); pthread_kill( listener_tid, SIGUSR1 );
#endif #endif /* !linux */
pthread_cond_wait( &conn->c_wcv, &active_threads_mutex ); pthread_cond_wait( &conn->c_wcv, &active_threads_mutex );
pthread_mutex_unlock( &active_threads_mutex ); pthread_mutex_unlock( &active_threads_mutex );

54
servers/slapd/tools/Make-template
View file

@ -78,8 +78,8 @@ ldif2ldbm: ldif2ldbm.sed.o ../libbackends.a $(OBJS2)
../libbackends.a $(LDFLAGS) $(LIBS2) ../libbackends.a $(LDFLAGS) $(LIBS2)
ldif2ldbm.sed.c: ldif2ldbm.c ldif2ldbm.sed.c: ldif2ldbm.c
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' \ $(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' \
-e 's;%SBINDIR%;$(SBINDIR);' \ -e 's;%SBINDIR%;$(LDAP_SBINDIR);' \
ldif2ldbm.c > ldif2ldbm.sed.c ldif2ldbm.c > ldif2ldbm.sed.c
ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2) ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2)
@ -108,49 +108,49 @@ ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2)
$(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \ $(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \
../libbackends.a $(LDFLAGS) $(LIBS2) ../libbackends.a $(LDFLAGS) $(LIBS2)
install: $(SBINDIR) $(SBINDIR)/edb2ldif $(SBINDIR)/ldif2ldbm \ install: $(LDAP_SBINDIR) $(LDAP_SBINDIR)/edb2ldif $(LDAP_SBINDIR)/ldif2ldbm \
$(SBINDIR)/ldif2index $(SBINDIR)/ldif2id2entry \ $(LDAP_SBINDIR)/ldif2index $(LDAP_SBINDIR)/ldif2id2entry \
$(SBINDIR)/ldif2id2children $(SBINDIR)/ldbmcat \ $(LDAP_SBINDIR)/ldif2id2children $(LDAP_SBINDIR)/ldbmcat \
$(SBINDIR)/centipede $(SBINDIR)/ldbmtest \ $(LDAP_SBINDIR)/centipede $(LDAP_SBINDIR)/ldbmtest \
$(SBINDIR)/ldif $(LDAP_SBINDIR)/ldif
$(SBINDIR)/edb2ldif: build-edb2ldif $(LDAP_SBINDIR)/edb2ldif: build-edb2ldif
@if [ "$(HAVEISODE)" = "yes" ]; then \ @if [ "$(HAVEISODE)" = "yes" ]; then \
$(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(SBINDIR); \ $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(LDAP_SBINDIR); \
else \ else \
exit 0; \ exit 0; \
fi fi
$(SBINDIR)/chlog2replog: build-chlog2replog $(LDAP_SBINDIR)/chlog2replog: build-chlog2replog
@if [ "$(HAVEISODE)" = "yes" ]; then \ @if [ "$(HAVEISODE)" = "yes" ]; then \
$(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(SBINDIR); \ $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(LDAP_SBINDIR); \
else \ else \
exit 0; \ exit 0; \
fi fi
$(SBINDIR)/ldif2ldbm: ldif2ldbm $(LDAP_SBINDIR)/ldif2ldbm: ldif2ldbm
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(LDAP_SBINDIR)
$(SBINDIR)/ldif2index: ldif2index $(LDAP_SBINDIR)/ldif2index: ldif2index
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(LDAP_SBINDIR)
$(SBINDIR)/ldif2id2entry: ldif2id2entry $(LDAP_SBINDIR)/ldif2id2entry: ldif2id2entry
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(LDAP_SBINDIR)
$(SBINDIR)/ldif2id2children: ldif2id2children $(LDAP_SBINDIR)/ldif2id2children: ldif2id2children
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(LDAP_SBINDIR)
$(SBINDIR)/ldbmcat: ldbmcat $(LDAP_SBINDIR)/ldbmcat: ldbmcat
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(LDAP_SBINDIR)
$(SBINDIR)/ldif: ldif $(LDAP_SBINDIR)/ldif: ldif
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(LDAP_SBINDIR)
$(SBINDIR)/centipede: centipede $(LDAP_SBINDIR)/centipede: centipede
$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(LDAP_SBINDIR)
$(SBINDIR)/ldbmtest: ldbmtest $(LDAP_SBINDIR)/ldbmtest: ldbmtest
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(SBINDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(LDAP_SBINDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

6
servers/slurpd/Make-template
View file

@ -56,10 +56,10 @@ version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a
-e "s|%VERSION%|$${v}|" \ -e "s|%VERSION%|$${v}|" \
< Version.c > $@) < Version.c > $@)
install: $(LIBEXECDIR) $(LIBEXECDIR)/slurpd install: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slurpd
$(LIBEXECDIR)/slurpd: slurpd $(LDAP_LIBEXECDIR)/slurpd: slurpd
$(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LIBEXECDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LDAP_LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)