gunnar: server/pear/PEAR-Archive_Tar Makefile,1.5,1.6

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


Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv22913/pear/PEAR-Archive_Tar

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/pear/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	23 Jul 2007 17:23:21 -0000	1.5
+++ Makefile	27 Jul 2007 10:30:33 -0000	1.6
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+  RPM = $(HOME)/bin/openpkg rpm
+endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 ifeq "x$(KOLABRPMPKG)" "x"
   KOLABRPMPKG = /kolab/RPM/PKG
 endif
-
-RPM = /kolab/bin/openpkg rpm
+ifeq "x$(KOLABRPMTMP)" "x"
+  KOLABRPMTMP = /kolab/RPM/TMP
+endif
 
 PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
 PACKAGE = PEAR-$(PEAR_NAME)
@@ -23,8 +27,8 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf $(KOLABRPMTMP)/$(PEAR_NAME)*
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 





More information about the commits mailing list