gunnar: server/make-helper package.mk,1.5,1.6

cvs at kolab.org cvs at kolab.org
Mon Jan 11 16:52:14 CET 2010


Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv17079

Modified Files:
	package.mk 
Log Message:
Set basic variables if they are undefined. Link target all to dist as this is correctly described as the default target.

Index: package.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- package.mk	5 Jan 2010 16:24:55 -0000	1.5
+++ package.mk	11 Jan 2010 15:52:12 -0000	1.6
@@ -1,10 +1,19 @@
-ifeq ($(RELEASETARGET),)
-RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-endif
+PACKAGE ?= $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
+VERSION ?= $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
+RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_rekease\s*\([0-9._a-z]*\).*/\1/")
+
+SOURCE_URL ?= 
+SOURCE_FORMAT ?= tar.gz
+SOURCE_0 ?= $(PACKAGE)-$(VERSION).$(SOURCE_FORMAT)
+EXTRA ?=
+
+BUILD_OPTIONS ?=
+
+RELEASETARGET ?= $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 # Default target to generate the source rpm package
 .PHONY: all
-all: $(RELEASETARGET)
+all: dist
 
 # Target for placing the source rpm in the staging area. This target
 # includes building the binary package which is an additional check for





More information about the commits mailing list