cyrus-sasl: Make package work on x86_64.

[people/ms/ipfire-3.x.git] / cyrus-sasl / cyrus-sasl.nm

diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index 4609f37beee9e2d6e241de834c1dede2a2262db8..9021c82ac8f857b0e5a87b0538e3767d320bf6e0 100644 (file)
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -5,7 +5,7 @@
 
 name       = cyrus-sasl
 version    = 2.1.25
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://asg.web.cmu.edu/sasl/sasl-library.html
@@ -29,15 +29,22 @@ build
 
        configure_options += \
                --sysconfdir=/etc \
+               --with-configdir=%{libdir}/sasl2:/etc/sasl2 \
+               --with-plugindir=%{libdir}/sasl2 \
                --with-dbpath=/var/lib/sasl/sasldb2 \
                --with-saslauthd=/var/run/saslauthd \
                --mandir=/usr/share/man
 
        PARALLELISMFLAGS = # Disabled
 
+       make_install_targets += sasldir=%{libdir}/sasl2
+
        install_cmds
-               mkdir -pv %{BUILDROOT}/usr/lib/sasl2
-               cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}/usr/lib/sasl2/
+               # Install plugins.
+               make install DESTDIR=%{BUILDROOT} sasldir=%{libdir}/sasl2 -C plugins
+
+               mkdir -pv %{BUILDROOT}%{libdir}/sasl2
+               cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}%{libdir}/sasl2/
 
                install -v -m700 -d %{BUILDROOT}/var/lib/sasl %{BUILDROOT}/var/run/saslauthd
        end
@@ -45,7 +52,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-libs
                template LIBS