devel/common Makefile.common,1.78,1.79

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Tue Oct 23 13:37:40 UTC 2007


Author: katzj

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

Modified Files:
	Makefile.common 
Log Message:
don't need to do the early branch check anymore


Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/devel/common/Makefile.common,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Makefile.common	3 Oct 2007 15:52:14 -0000	1.78
+++ Makefile.common	23 Oct 2007 13:37:10 -0000	1.79
@@ -22,9 +22,9 @@
 BRANCH:=$(shell [ -f branch ] && cat branch || echo $(HEAD_BRANCH))
 # check to see if this is an early branched package; we should make this more
 # generic in the future
-ifeq ($(BRANCH),devel)
-BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-8/$(SPECFILE) >/dev/null 2>&1 && echo "F-9" || echo "devel")
-endif
+#ifeq ($(BRANCH),devel)
+#BRANCH:=$(shell cvs rlog rpms/$(NAME)/F-8/$(SPECFILE) >/dev/null 2>&1 && echo "F-9" || echo "devel")
+#endif
 BRANCHINFO = $(shell grep ^$(BRANCH): $(COMMON_DIR)/branches | cut -d: --output-delimiter=" " -f2-)
 TARGET := $(word 1, $(BRANCHINFO))
 DIST = $(word 2, $(BRANCHINFO))




More information about the fedora-extras-commits mailing list