--- common/Makefile.common 2008/07/30 18:02:34 1.13 +++ common/Makefile.common 2010/03/16 15:38:36 1.17 @@ -5,7 +5,7 @@ # Copyright (C) 2004-2005 Red Hat, Inc. # Copyright (C) 2005 Fedora Foundation # -# $Id: Makefile.common,v 1.12 2008/03/28 14:38:42 slords Exp $ +# $Id: Makefile.common,v 1.16 2010/02/20 20:10:22 slords Exp $ # Define the common dir. # This needs to happen first. @@ -46,7 +46,7 @@ SRCRPMDIR ?= $(WORKDIR) BUILDDIR ?= $(WORKDIR) RPMDIR ?= $(WORKDIR) MOCKDIR ?= $(WORKDIR) -MOCKCFG ?= smeserver-$(SMEVAL)-$(BUILDARCH)-core +MOCKCFG ?= smeserver-$(SMEVAL)-$(BUILDARCH)-base ## SOURCEDIR is special; it has to match the CVS checkout directory, ## because the CVS checkout directory contains the patch files. So it basically ## can't be overridden without breaking things. But we leave it a variable @@ -94,7 +94,7 @@ include $(CVS_EXTRAS_RC) endif # The repository and the clients we use for the files -REPOSITORY ?= http://lordsfam.net/yum/builds/source +REPOSITORY ?= http://buildsys.contribs.org/source UPLOAD_REPOSITORY ?= /builds/source # We define CURL and WGET in a way that makes if possible to have them @@ -291,7 +291,7 @@ install-short: sources $(TARGETS) CVS_ROOT := $(shell if [ -f CVS/Root ] ; then cat CVS/Root ; fi) CVS_REPOSITORY := $(shell if [ -f CVS/Repository ] ; then cat CVS/Repository ; fi) -CVS_URL := cvs://smeserver.cvs.sourceforge.net:/cvsroot/smeserver?$(CVS_REPOSITORY)\#$(TAG) +CVS_URL := cvs://smeserver.cvs.sourceforge.net/cvsroot/smeserver?$(CVS_REPOSITORY)\#$(TAG) ## create a clean exported copy in $(TMPCVS) export:: sources