devel/common Makefile.common,1.12,1.13

Mon May 9 21:14:19 UTC 2005

Author: katzj

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

Modified Files:
	Makefile.common 
Log Message:
fix branch determination if you're using a checkout of, eg, all of devel.
noticed by chris ricker.



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

--- Makefile.common	9 May 2005 19:11:30 -0000	1.12
+++ Makefile.common	9 May 2005 21:14:17 -0000	1.13
@@ -13,7 +13,10 @@
 
 # Branch and disttag definitions
 # These need to happen second.
-BRANCH = $(shell basename $(shell pwd))
+ifndef HEAD_BRANCH
+HEAD_BRANCH := devel
+endif
+BRANCH:=$(shell [ -f branch ] && cat branch || echo $(HEAD_BRANCH))
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET ?= $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))


