steffen: server/apache Makefile,1.22,1.23

cvs at kolab.org cvs at kolab.org
Mon Nov 6 14:22:38 CET 2006


Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	3 Nov 2006 17:55:45 -0000	1.22
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.23
@@ -4,6 +4,9 @@
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = /kolab/RPM/PKG
+endif
 ifeq "x$(KOLABCVSDIR)" "x"
   KOLABCVSDIR = $(CURDIR)
 endif
@@ -16,14 +19,16 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES = $(KOLABCVSDIR)/mod_auth_ldap.patch \
+	$(KOLABCVSDIR)/../php/php-getacl-backport.patch \
+	$(KOLABCVSDIR)/../php/php-imap-annotation.patch \
+	$(KOLABCVSDIR)/../php/php-imap-status-current.patch
 
-	cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 		--define 'with_mod_auth_ldap yes' \
 		--define 'with_mod_dav yes' \
@@ -36,6 +41,8 @@
 		--define 'with_mod_php_xml yes' \
 		--define 'with_mod_php_dom yes' \
 		--define 'with_mod_ssl yes' 
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list