gunnar: server/pear Base.mk,1.1,1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear
In directory doto:/tmp/cvs-serv16758

Modified Files:
	Base.mk 
Log Message:
Do not let the Makefile fail on non-openpkg systems.

Index: Base.mk
===================================================================
RCS file: /kolabrepository/server/pear/Base.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Base.mk	18 May 2009 17:36:02 -0000	1.1
+++ Base.mk	18 May 2009 19:49:56 -0000	1.2
@@ -18,10 +18,22 @@
   HOME = /kolab
 endif
 
+# Is this an openpkg system?
+OPENPKG=$(shell test -e $(HOME)/bin/openpkg && echo YES)
+
+ifeq "x$(OPENPKG)" "xYES"
 # Set the location of the rpm binary
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
 endif
+# Determine the suffix for binary packages on this system
+ifeq "x$(PLATTAG)" "x"
+  PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+else
+  RPM =
+  PLATTAG = unknown
+endif
 
 # Set the location for rpm source package installations
 ifeq "x$(KOLABRPMSRC)" "x"
@@ -36,9 +48,4 @@
 # Set the location for the rpm temporary directory
 ifeq "x$(KOLABRPMTMP)" "x"
   KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-# Determine the suffix for binary packages on this system
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
 endif