Author: thl Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv14479/F-8 Modified Files: Makefile Log Message: revert Makefile changes Index: Makefile =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-8/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 3 Oct 2008 10:14:27 -0000 1.2 +++ Makefile 3 Oct 2008 10:21:32 -0000 1.3 @@ -1,21 +1,22 @@ -# Makefile for source rpm: ntfs-kmod +# Makefile for source rpm: buildsys-build-rpmfusion # $Id$ NAME := buildsys-build-rpmfusion SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ../../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/.svn/entries -a -w $$/Makefile.common ] ; then cd $$d ; svn -q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) +MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f .svn/entries && { svn -q checkout $$(svn info |grep '^URL :'|cut -d' ' -f 3|cut -d/ -f -4)/common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' directory module." ; exit -1 ; } >&2 +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) +