4 files changed, 8 insertions, 9 deletions
diff --git a/net-nds/openldap/files/slapd b/net-nds/openldap/files/slapd
index c0c81f546b7e..13e51dea99a7 100755
--- a/net-nds/openldap/files/slapd
+++ b/net-nds/openldap/files/slapd
@@ -4,7 +4,7 @@
 . /etc/rc.d/config/functions
 
 SERVICE=ldap-server
-EXE="/usr/libexec/openldap/slapd"
+EXE="/usr/lib/openldap/slapd"
 opts="start stop restart"
 
 start() {
diff --git a/net-nds/openldap/files/slurpd b/net-nds/openldap/files/slurpd
index cc25619568e6..01824858809e 100755
--- a/net-nds/openldap/files/slurpd
+++ b/net-nds/openldap/files/slurpd
@@ -4,7 +4,7 @@
 . /etc/rc.d/config/functions
 
 SERVICE=slurpd
-EXE="/usr/libexec/openldap/slurpd"
+EXE="/usr/lib/openldap/slurpd"
 opts="start stop restart"
 
 start() {
diff --git a/net-nds/openldap/openldap-1.2.12.ebuild b/net-nds/openldap/openldap-1.2.12.ebuild
index 5debe7240673..f3bfde159d2b 100644
--- a/net-nds/openldap/openldap-1.2.12.ebuild
+++ b/net-nds/openldap/openldap-1.2.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-1.2.12.ebuild,v 1.1 2001/06/08 01:58:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-1.2.12.ebuild,v 1.2 2001/06/11 10:56:47 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -32,7 +32,7 @@ src_compile() {
   ./configure --host=${CHOST} --enable-passwd \
 	      --enable-shell --enable-shared --enable-static \
 	      --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib \
-	      --mandir=/usr/share/man --libexecdir=/usr/lib $myconf
+	      --mandir=/usr/share/man --libexecdir=/usr/lib/openldap $myconf
   try make depend
   try make
   cd tests
@@ -42,7 +42,7 @@ src_compile() {
 src_install() {                               
   cd ${S}
   make prefix=${D}/usr sysconfdir=${D}/etc/openldap localstatedir=${D}/var/lib	\
-	mandir=${D}/usr/share/man libexecdir=${D}/usr/lib install
+	mandir=${D}/usr/share/man libexecdir=${D}/usr/lib/openldap install
 
   dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
   docinto rfc
diff --git a/net-nds/openldap/openldap-2.0.11.ebuild b/net-nds/openldap/openldap-2.0.11.ebuild
index 7dbacbf0da2e..fa3a6b3d8c8e 100644
--- a/net-nds/openldap/openldap-2.0.11.ebuild
+++ b/net-nds/openldap/openldap-2.0.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.11.ebuild,v 1.1 2001/06/08 01:58:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.11.ebuild,v 1.2 2001/06/11 10:56:47 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -44,7 +44,7 @@ src_compile() {
   try ./configure --host=${CHOST} --enable-passwd \
 	      --enable-shell --enable-shared --enable-static --enable-ipv6 \
 	      --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state \
-              --mandir=/usr/share/man  --libexecdir=/usr/li$myconf
+              --mandir=/usr/share/man  --libexecdir=/usr/lib/openldap $myconf
   try make depend
   try make
   cd tests
@@ -54,8 +54,7 @@ src_compile() {
 src_install() {
 
   try make prefix=${D}/usr sysconfdir=${D}/etc/openldap \
-        localstatedir=${D}/var/state mandir=${D}/usr/share/man libexecdir=${D}/usr/lib install
-  prepman
+        localstatedir=${D}/var/state mandir=${D}/usr/share/man libexecdir=${D}/usr/lib/openldap  install
 
   dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
   docinto rfc