Merge remote-tracking branch 'arne_f/autoconf'

[people/arne_f/ipfire-3.x.git] / openldap / openldap.nm

diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index a664039f13542582ef68e02a078dc101a93eff1b..fef3ca5500d9449c74f5e0356cd43b7f7e8a32cb 100644 (file)
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = openldap
-version    = 2.4.28
+version    = 2.4.30
 release    = 1
 
 groups     = System/Daemons
@@ -36,7 +36,7 @@ build
        end
 
        configure_options += \
-               --libexecdir=/usr/lib \
+               --libexecdir=%{libdir} \
                --sysconfdir=/etc \
                --localstatedir=/var \
                --with-threads=posix \
@@ -57,7 +57,7 @@ build
 #endef
 
        install_cmds
-               mv -v %{BUILDROOT}/usr/lib/slapd %{BUILDROOT}/usr/sbin/slapd
+               mv -v %{BUILDROOT}%{libdir}/slapd %{BUILDROOT}/usr/sbin/slapd
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapacl
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapadd
                ln -svf slapd %{BUILDROOT}/usr/sbin/slapauth
@@ -71,7 +71,7 @@ build
                rm -rvf %{BUILDROOT}/var/openldap-data
 
                for LINK in lber ldap ldap_r; do
-                       chmod -v 0755 %{BUILDROOT}/usr/lib/$(readlink %{BUILDROOT}/usr/lib/lib${LINK}.so)
+                       chmod -v 0755 %{BUILDROOT}%{libdir}/$(readlink %{BUILDROOT}%{libdir}/lib${LINK}.so)
                done
 
                # Install configuration