X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Famavisd;h=39464e4e6916314ec0041dc1f939c5bec77ad653;hp=35b483be026fb07703b9ea0d3666a0d1c6266369;hb=03fa5cba13c77b0a4ee8a1e84bf895af113ecb26;hpb=f5679937b82bfce56f7d9599a072e838133e21fa

diff --git a/lfs/amavisd b/lfs/amavisd
index 35b483be0..39464e4e6 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -77,17 +77,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && cp -f amavisd /usr/local/bin
-	cd $(DIR_APP) && chown root.root /usr/local/bin/amavisd
-	cd $(DIR_APP) && chmod 755 /usr/local/bin/amavisd
-	cd $(DIR_APP) && cp amavisd.conf /etc
-	cd $(DIR_APP) && chown root.root /etc/amavisd.conf
-	cd $(DIR_APP) && chmod 644 /etc/amavisd.conf
-	cd $(DIR_APP) && test -d /var/virusmails || mkdir /var/virusmails
-	cd $(DIR_APP) && chown amavis.amavis /var/virusmails
-	cd $(DIR_APP) && chmod 750 /var/virusmails
-	cd $(DIR_APP) && test -d /var/amavis || mkdir /var/amavis
-	cd $(DIR_APP) && chown amavis.amavis /var/amavis
-	cd $(DIR_APP) && chmod 750 /var/amavis
+	cd $(DIR_APP) && cp -f amavisd /usr/bin
+	chown root.root /usr/bin/amavisd
+	chmod 755 /usr/bin/amavisd
+	cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc
+	chown root.root /etc/amavisd.conf
+	chmod 644 /etc/amavisd.conf
+	-mkdir -p /var/amavis/{db,tmp} /var/virusmails
+	chown amavis.amavis -Rv /var/{amavis,virusmails}
+	chmod 750 -Rv /var/{amavis,virusmails}
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)