Makefile.common change

Bill Nottingham notting at redhat.com
Thu Apr 24 03:06:49 UTC 2008


Dennis Gilmore (dennis at ausil.us) said: 
> ? Makefile.common.branch
> Index: Makefile.common
> ===================================================================
> RCS file: /cvs/pkgs/common/Makefile.common,v
> retrieving revision 1.94
> diff -u -r1.94 Makefile.common
> --- Makefile.common	22 Apr 2008 15:44:53 -0000	1.94
> +++ Makefile.common	24 Apr 2008 02:30:13 -0000
> @@ -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)

Seems good. Of course, there's 5000 ways to do it, with cut, awk, ${foo##*/}, etc.

Bill




More information about the Fedora-buildsys-list mailing list