--- build/man.mk.orig	2013-03-13 19:51:52.000000000 +0200
+++ build/man.mk	2013-03-13 19:52:53.000000000 +0200
@@ -20,8 +20,7 @@
 TMP_SUFFIX=tmp
 
 all-common:
-	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
-	for page in $$PAGES; do \
+	for page in ${PAGES}; do \
 		$(SED) -e "s%LDVERSION%$(VERSION)%" \
 			-e 's%ETCDIR%$(sysconfdir)%g' \
 			-e 's%LOCALSTATEDIR%$(localstatedir)%' \
@@ -39,8 +38,7 @@
 
 install-common:
 	-$(MKDIR) $(DESTDIR)$(MANDIR)
-	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
-	for page in $$PAGES; do \
+	for page in ${PAGES}; do \
 		echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
 		$(RM) $(DESTDIR)$(MANDIR)/$$page; \
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
--- doc/man/man1/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
+++ doc/man/man1/Makefile.in	2013-03-13 20:30:47.000000000 +0200
@@ -14,3 +14,20 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MANSECT=1
+
+BUILD_SRV = @BUILD_SLAPD@
+
+.if ${BUILD_SRV} == no
+PAGES=	ldapcompare.${MANSECT}		\
+	ldapdelete.${MANSECT}		\
+	ldapexop.${MANSECT}		\
+	ldapmodify.${MANSECT}		\
+	ldapmodrdn.${MANSECT}		\
+	ldappasswd.${MANSECT}		\
+	ldapsearch.${MANSECT}		\
+	ldapurl.${MANSECT}		\
+	ldapwhoami.${MANSECT}
+.else
+PAGES=
+.endif
+
--- doc/man/man3/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
+++ doc/man/man3/Makefile.in	2013-03-13 20:31:03.000000000 +0200
@@ -14,3 +14,49 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MANSECT=3
+
+BUILD_SRV = @BUILD_SLAPD@
+
+.if ${BUILD_SRV} == no
+PAGES=	lber-decode.${MANSECT}		\
+	lber-encode.${MANSECT}		\
+	lber-memory.${MANSECT}		\
+	lber-sockbuf.${MANSECT}		\
+	lber-types.${MANSECT}		\
+	ldap.${MANSECT}			\
+	ldap_abandon.${MANSECT}		\
+	ldap_add.${MANSECT}		\
+	ldap_bind.${MANSECT}		\
+	ldap_compare.${MANSECT}		\
+	ldap_controls.${MANSECT}	\
+	ldap_delete.${MANSECT}		\
+	ldap_dup.${MANSECT}		\
+	ldap_error.${MANSECT}		\
+	ldap_extended_operation.${MANSECT}	\
+	ldap_first_attribute.${MANSECT}	\
+	ldap_first_entry.${MANSECT}	\
+	ldap_first_message.${MANSECT}	\
+	ldap_first_reference.${MANSECT}	\
+	ldap_get_dn.${MANSECT}		\
+	ldap_get_option.${MANSECT}	\
+	ldap_get_values.${MANSECT}	\
+	ldap_memory.${MANSECT}		\
+	ldap_modify.${MANSECT}		\
+	ldap_modrdn.${MANSECT}		\
+	ldap_open.${MANSECT}		\
+	ldap_parse_reference.${MANSECT}	\
+	ldap_parse_result.${MANSECT}	\
+	ldap_parse_sort_control.${MANSECT}	\
+	ldap_parse_vlv_control.${MANSECT}	\
+	ldap_rename.${MANSECT}		\
+	ldap_result.${MANSECT}		\
+	ldap_schema.${MANSECT}		\
+	ldap_search.${MANSECT}		\
+	ldap_sort.${MANSECT}		\
+	ldap_sync.${MANSECT}		\
+	ldap_tls.${MANSECT}		\
+	ldap_url.${MANSECT}
+.else
+PAGES=
+.endif
+
--- doc/man/man5/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
+++ doc/man/man5/Makefile.in	2013-03-13 20:31:37.000000000 +0200
@@ -14,3 +14,54 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MANSECT=5
+
+BUILD_SRV = @BUILD_SLAPD@
+
+.if ${BUILD_SRV} == no
+PAGES=	ldap.conf.${MANSECT} 		\
+	ldif.${MANSECT}
+.else
+PAGES=	slapd-bdb.${MANSECT}		\
+	slapd-config.${MANSECT}		\
+	slapd-dnssrv.${MANSECT}		\
+	slapd-ldap.${MANSECT}		\
+	slapd-ldbm.${MANSECT}		\
+	slapd-ldif.${MANSECT}		\
+	slapd-mdb.${MANSECT}		\
+	slapd-meta.${MANSECT}		\
+	slapd-monitor.${MANSECT}	\
+	slapd-ndb.${MANSECT}		\
+	slapd-null.${MANSECT}		\
+	slapd-passwd.${MANSECT}		\
+	slapd-perl.${MANSECT}		\
+	slapd-relay.${MANSECT}		\
+	slapd-shell.${MANSECT}		\
+	slapd-sock.${MANSECT}		\
+	slapd-sql.${MANSECT}		\
+	slapd.access.${MANSECT}		\
+	slapd.backends.${MANSECT}	\
+	slapd.conf.${MANSECT}		\
+	slapd.overlays.${MANSECT}	\
+	slapd.plugin.${MANSECT}		\
+	slapo-accesslog.${MANSECT}	\
+	slapo-auditlog.${MANSECT}	\
+	slapo-chain.${MANSECT}		\
+	slapo-collect.${MANSECT}	\
+	slapo-constraint.${MANSECT}	\
+	slapo-dds.${MANSECT}		\
+	slapo-dyngroup.${MANSECT}	\
+	slapo-dynlist.${MANSECT}	\
+	slapo-memberof.${MANSECT}	\
+	slapo-pbind.${MANSECT}		\
+	slapo-pcache.${MANSECT}		\
+	slapo-ppolicy.${MANSECT}	\
+	slapo-refint.${MANSECT}		\
+	slapo-retcode.${MANSECT}	\
+	slapo-rwm.${MANSECT}		\
+	slapo-sssvlv.${MANSECT}		\
+	slapo-syncprov.${MANSECT}	\
+	slapo-translucent.${MANSECT}	\
+	slapo-unique.${MANSECT}		\
+	slapo-valsort.${MANSECT}
+.endif
+
--- doc/man/man8/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
+++ doc/man/man8/Makefile.in	2013-03-13 20:32:07.000000000 +0200
@@ -14,3 +14,21 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MANSECT=8
+
+BUILD_SRV = @BUILD_SLAPD@
+
+.if ${BUILD_SRV} == no
+PAGES=	
+.else
+PAGES=	slapacl.${MANSECT}		\
+	slapadd.${MANSECT}		\
+	slapauth.${MANSECT}		\
+	slapcat.${MANSECT}		\
+	slapd.${MANSECT}		\
+	slapdn.${MANSECT}		\
+	slapindex.${MANSECT}		\
+	slappasswd.${MANSECT}		\
+	slapschema.${MANSECT}		\
+	slaptest.${MANSECT}
+.endif
+