--- rpms/smeserver-gallery2/contribs7/Makefile 2007/12/25 04:56:55 1.1 +++ rpms/smeserver-gallery2/contribs7/Makefile 2008/11/25 16:20:22 1.4 @@ -1,10 +1,10 @@ # Makefile for source rpm: smeserver-gallery2 -# $Id$ +# $Id: Makefile,v 1.2 2008/02/06 21:03:34 slords Exp $ NAME := smeserver-gallery2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in ../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 +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)) @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefi ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Root && { cd .. ; 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 +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))