common Makefile.common,1.94,1.95

Dennis Gilmore (ausil) fedora-extras-commits at redhat.com
Thu Apr 24 03:53:27 UTC 2008


Author: ausil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26589

Modified Files:
	Makefile.common 
Log Message:
allow us to rebuild srpms after branching



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- Makefile.common	22 Apr 2008 15:44:53 -0000	1.94
+++ Makefile.common	24 Apr 2008 03:52:57 -0000	1.95
@@ -19,7 +19,7 @@
 ifndef HEAD_BRANCH
 HEAD_BRANCH := devel
 endif
-BRANCH:=$(shell [ -f branch ] && cat branch || echo $(HEAD_BRANCH))
+BRANCH:=$(lastword $(shell pwd| cut -d/ --output-delimiter=" " -f2-))
 # check to see if this is an early branched package; we should make this more
 # generic in the future
 ifeq ($(BRANCH),devel)




More information about the scm-commits mailing list