wilde: server/openpkg Makefile,1.1.2.3,1.1.2.4

cvs at kolab.org cvs at kolab.org
Mon Nov 9 18:09:11 CET 2009


Author: wilde

Update of /kolabrepository/server/openpkg
In directory doto:/tmp/cvs-serv27852/openpkg

Modified Files:
      Tag: kolab_2_2_branch
	Makefile 
Log Message:
Some refactoring of common variables in Makefiles to the new kolab.mk.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openpkg/Makefile,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- Makefile	9 Nov 2009 14:23:51 -0000	1.1.2.3
+++ Makefile	9 Nov 2009 17:08:39 -0000	1.1.2.4
@@ -1,21 +1,5 @@
 include ../kolab.mk
 
-ifeq "x$(KOLABPKGURI)" "x"
-	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-	KOLABRPMSRC = $(KOLABDIR)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-	KOLABRPMPKG = $(KOLABDIR)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
-	KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
-	RPM = $(KOLABDIR)/bin/openpkg rpm
-endif
-
 PACKAGE=openpkg
 VERSION=20071227
 RELEASE=20071227
@@ -28,12 +12,12 @@
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh
 
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(CURSRCDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(KOLABCVSDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(KOLABCVSDIR)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(CURSRCDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(CURSRCDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -42,7 +26,7 @@
 	wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
 
 dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/
+	cp $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/
 
 clean:
-	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh
+	rm -f $(CURSRCDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh





More information about the commits mailing list