gunnar: server/openldap Makefile,1.19,1.20

cvs at kolab.org cvs at kolab.org
Fri Jul 27 12:30:35 CEST 2007


Author: gunnar

Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv22913/openldap

Modified Files:
	Makefile 
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	17 Jul 2007 16:50:30 -0000	1.19
+++ Makefile	27 Jul 2007 10:30:33 -0000	1.20
@@ -1,26 +1,44 @@
+PACKAGE=openldap
+VERSION=2.3.29
+RELEASE=2.20061110
+KOLABRELEASE=2.20061110_kolab
+
 ifeq "x$(KOLABPKGURI)" "x"
   KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
 endif
+ifeq "x$(RPM)" "x"
+  RPM = $(HOME)/bin/openpkg rpm
+endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = /kolab/RPM/SRC
+  KOLABRPMSRC = $(HOME)/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = /kolab/RPM/PKG
+  KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+  KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 ifeq "x$(KOLABCVSDIR)" "x"
   KOLABCVSDIR = $(CURDIR)
 endif
 
-PACKAGE=openldap
-VERSION=2.3.29
-RELEASE=2.20061110
-KOLABRELEASE=2.20061110_kolab
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-RPM=/kolab/bin/openpkg rpm
+PATCHES=
 
+.PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
-PATCHES=
+.PHONY: dist
+dist: all
+	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
+	rm -rf $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf *~
 
 $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -33,8 +51,3 @@
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-dist: all
-	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
-
-clean:
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)





More information about the commits mailing list