gunnar: server/php-kolab Makefile,1.6,1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv27508

Modified Files:
	Makefile 
Log Message:
Increase flexibility when determining the location of the pear binary.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	16 Aug 2007 06:00:01 -0000	1.6
+++ Makefile	16 Aug 2007 06:32:46 -0000	1.7
@@ -32,6 +32,23 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
+ifeq "x$(PEAR)" "x"
+  PEAR = $(HOME)/bin/pear
+endif
+PEAR_EXISTS= $(shell [ -x "$(PEAR)" ] || echo "0")
+ifeq "x$(PEAR_EXISTS)" "x0"
+  PEAR = /usr/bin/pear
+endif
+PEAR_EXISTS= $(shell [ -x "$(PEAR)" ] || echo "0")
+ifeq "x$(PEAR_EXISTS)" "x0"
+  PEAR = /bin/pear
+endif
+PEAR_EXISTS= $(shell [ -x "$(PEAR)" ] || echo "0")
+ifeq "x$(PEAR_EXISTS)" "x0"
+  $(error Cannot determine location of the pear executable. Please specify the location using $PEAR.)
+endif
+
+
 .PHONY: all
 all: $(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm
 
@@ -78,4 +95,4 @@
 	  sed -e "s/@DATE@/$(DATE)/"                 \
 	  > $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
 
-	$(HOME)/bin/pear package $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
+	$(PEAR) package $(@:%-$(SOURCE_TAG).tgz=%)/package.xml