--- common/cvs-import.sh	2007/12/24 17:33:50	1.6
+++ common/cvs-import.sh	2008/02/08 18:52:15	1.7
@@ -5,7 +5,7 @@
 # Copyright (C) 2004-2005 Red Hat, Inc.
 # Copyright (C) 2005 Fedora Foundation
 #
-# $Id: cvs-import.sh,v 1.2 2007/11/08 18:07:31 slords Exp $
+# $Id: cvs-import.sh,v 1.4 2008/02/06 21:03:30 slords Exp $
 
 # Initial setup
 CVSTREE=${CVSTREE:=extras}
@@ -142,7 +142,7 @@ NAME := $NAME
 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))
@@ -150,7 +150,7 @@ MAKEFILE_COMMON := \$(shell \$(find-make
 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))