steffen: server/php Makefile,1.4,1.5
cvs at kolab.org
cvs at kolab.org
Mon Nov 6 14:22:39 CET 2006
Author: steffen
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv28934/php
Modified Files:
Makefile
Log Message:
avoid rebuilding everything every time
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 20 Dec 2005 09:18:50 -0000 1.4
+++ Makefile 6 Nov 2006 13:22:36 -0000 1.5
@@ -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,12 +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)/php-getacl-backport.patch \
+ $(KOLABCVSDIR)/php-imap-annotation.patch \
+ $(KOLABCVSDIR)/php-imap-status-current.patch
- cp $(KOLABCVSDIR)/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
- cp $(KOLABCVSDIR)/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
- cp $(KOLABCVSDIR)/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+ $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpam
+
+ cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
--define 'with_zlib yes' \
@@ -34,12 +41,13 @@
--define 'with_dom yes' \
--define 'with_ssl yes' \
--define 'with_mbstring yes'
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+ cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
clean:
rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)*
More information about the commits
mailing list