gunnar: server/apache-php Makefile,1.8.2.4,1.8.2.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv2685/apache-php

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Remove unnecessary double building.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -d -r1.8.2.4 -r1.8.2.5
--- Makefile	21 Apr 2010 14:52:32 -0000	1.8.2.4
+++ Makefile	8 Jun 2010 10:00:10 -0000	1.8.2.5
@@ -17,9 +17,8 @@
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 \
-	  && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+	cd $(KOLABRPMSRC)/$(PACKAGE) && rm php-$(OLD_VERSION).tar.bz2 && wget http://www.php.net/distributions/php-$(VERSION).tar.bz2 && \
+	patch < $(CURSRCDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 	--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
 	--define 'with_pear yes' --define 'with_spl yes' --define 'with_gettext yes' \
 	--define 'with_dom yes' --define 'with_mcrypt yes' --define 'with_iconv yes' \