back out SOELIM fix, not needed in RE23

diff --git a/CHANGES b/CHANGES
index 9f0bda54819b8706a036947b9478c170cd08d6cb..4c28f120fcac42120df3592b0a9111156afe39e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,6 @@ OpenLDAP 2.3.32 Engineering
        Fixed slapd values return filter control leak (ITS#4794)
        Fixed slapd-sql Debug typo (ITS#4784)
        Documentation
-               Fixed man page .so bug
                Fixed reference to deprecated option in admin guide (ITS#4795)
 
 OpenLDAP 2.3.31 Release

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

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