Change cyrus-sasl from package to common.

[people/pmueller/ipfire-2.x.git] / lfs / cyrus-imapd

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 1cfddab513da80792e00129f2d7b8b2bec042ed4..c9969d291247301b440a942ad2ee68c43256de3f 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "cyrus-sasl"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-auth=unix --with-perl --with-sasl --with-idle=idled \
                                --with-syslogfacility=MAIL --enable-listext --without-snmp
        cd $(DIR_APP) && make depend
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        -mkdir /var/imap
        chown cyrus:mail /var/imap
@@ -97,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown cyrus:mail /usr/sieve
        chmod 750 /usr/sieve
        -mkdir /var/ipfire/cyrusimap
-       cp -f $(DIR_SRC)/config/cyrusimap/* /var/ipfire/cyrusimap
+       cp -f $(DIR_SRC)/config/cyrus-imapd/* /var/ipfire/cyrusimap
        cp -f $(DIR_APP)/tools/mkimap /usr/bin
        sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
        chown cyrus.mail /var/imap/socket