import man page fix

diff --git a/CHANGES b/CHANGES
index ee3692fd449d435a0b1679f6cf04fac3aec6c498..7b98a493813c7aa2d82e0998daaaa78062f9ff5f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ OpenLDAP 2.3.32 Engineering
        Fixed slapd connection_get race condition on Windows (ITS#4793)
        Fixed slapd values return filter control leak (ITS#4794)
        Fixed slapd-sql Debug typo (ITS#4784)
+       Documentation
+               Fixed man page .so bug
 
 OpenLDAP 2.3.31 Release
        Fixed libldap unchased referral leak (ITS#4545)

diff --git a/build/man.mk b/build/man.mk
index d283f538081fb58f6b46d39a045f7bb1f44d7a4e..8284207aff3804d1c42ad314ece8e74019274387 100644 (file)
--- a/build/man.mk
+++ b/build/man.mk
@@ -32,7 +32,8 @@ all-common:
                        -e 's%LIBDIR%$(libdir)%' \
                        -e 's%LIBEXECDIR%$(libexecdir)%' \
                        -e 's%RELEASEDATE%$(RELEASEDATE)%' \
-                       $(srcdir)/$$page > $$page.$(TMP_SUFFIX); \
+                               $(srcdir)/$$page \
+                       | $(SOELIM) - > $$page.$(TMP_SUFFIX); \
        done
 
 install-common:

diff --git a/build/top.mk b/build/top.mk
index 7c624258cf0d440c5232aa7776836b18365e4e1e..c25d433ae4fc10af55a6a4339f0c422012ca06ef 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -149,6 +149,8 @@ SUBST = $(SHTOOL) subst
 MANCOMPRESS=$(CAT)
 MANCOMPRESSSUFFIX=
 
+SOELIM=soelim
+
 INCLUDEDIR= $(top_srcdir)/include
 LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBDIR= $(top_builddir)/libraries