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

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Pear.mk 
Log Message:
Fix variable parsing

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Pear.mk	23 Jun 2009 14:15:41 -0000	1.1
+++ Pear.mk	23 Jun 2009 14:24:08 -0000	1.2
@@ -14,16 +14,16 @@
 PEAR=$(HOME)/bin/pear
 
 # Determine the horde package name from the *.spec file
-HORDE_PKGDIR = $(shell grep "^horde_pkgdir=" package.info | sed -e "s/horde_pkgdir='\([A-Za-z0-9\-\_]*\)'\s*/\1/")
+HORDE_PKGDIR = $(shell grep "^horde_pkgdir=" package.info | sed -e "s/horde_pkgdir='\([A-Za-z0-9\-\_\/]*\)'\s*/\1/")
 
 # Determine the horde package name from the *.spec file
 HORDE_PACKAGE = $(shell grep "^horde_package=" package.info | sed -e "s/horde_package='\([A-Za-z0-9\_-]*\)'.*/\1/")
 
 # Determine the package origin from the *.spec file
-PACKAGE_ORIGIN = $(shell grep "^package_origin=" package.info | sed -e "s/package_origin='\([A-Z]*\)'.*/\1/")
+PACKAGE_ORIGIN = $(shell grep "^package_origin=" package.info | sed -e "s/package_origin='\([A-Z]*\).*/\1/")
 
 # Determine the package version control type from the *.spec file
-PACKAGE_VC = $(shell grep "^package_vc=" package.info | sed -e "s/package_vc='[A-Z]*-\([A-Z]*\)'.*/\1/")
+PACKAGE_VC = $(shell grep "^package_origin=" package.info | sed -e "s/package_origin='[A-Z]*-\([A-Z]*\)'.*/\1/")
 
 # Determine the package name from the *.spec file
 PACKAGE = $(shell grep "^package=" package.info | sed -e "s/package='\([A-Za-z0-9\_-]*\)'.*/\1/")