From 80ef7384afc04ff673399670fa5b528d6ab5d138 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:13:00 +0000 Subject: [PATCH] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba19a25..ce2fc88 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,22 @@ # Makefile for source rpm: parted -# $Id: Makefile,v 1.1 2004/09/09 09:51:28 cvsdist Exp $ +# $Id: Makefile,v 1.2 2004/09/20 16:15:19 katzj Exp $ NAME := parted SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sign -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON)