install mkimap with correctly prefixed paths, build paths are now handled by command line parameters

imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
 Version:      2.1.12
-Release:      20030429
+Release:      20030502
 
 #   package options
 %option       with_vhost_hack  no
@@ -98,8 +98,8 @@ Provides:     IMAP
         imapd.conf-mkimap
     %{l_shtool} subst \
         -e 's;^exec perl ;exec %{l_prefix}/bin/perl ;' \
-        -e "s;/etc/imapd.conf;$RPM_BUILD_DIR/cyrus-imapd-%{version}/imapd.conf-mkimap;" \
-        -e "s;^\(\$sievedir = \"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \
+        -e "s;/etc/imapd.conf;%{l_prefix}/etc/imapd/imapd.conf;" \
+        -e "s;^\(\$sievedir = \).*$;\1 shift || \"%{l_prefix}/var/imapd/sieve\"\;;" \
         tools/mkimap
 
     #   ajdust syslog ident of deliver program
@@ -189,7 +189,7 @@ Provides:     IMAP
         %{SOURCE fsl.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
     #   use mkimap to create many directories for us
-    tools/mkimap imapd.conf-mkimap
+    tools/mkimap imapd.conf-mkimap $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve
 
     #   rename files which are likely to cause namespace conflicts
     ( cd $RPM_BUILD_ROOT%{l_prefix}