From 571c4be1210ee52c2111b0d8d8606407eafd434a Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Wed, 8 Mar 2006 21:38:50 +0000 Subject: [PATCH] - move default values to site-specific Makefile --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6216b25c..72cb1a79 100644 --- a/Makefile +++ b/Makefile @@ -4,19 +4,12 @@ # Mark Huang # Copyright (C) 2003-2006 The Trustees of Princeton University # -# $Id: Makefile,v 1.84 2006/02/22 21:42:37 mlhuang Exp $ +# $Id: Makefile,v 1.85 2006/03/08 21:29:25 mlhuang Exp $ # # Default target all: -# Default values. If TAG is HEAD, a %{date} variable will be defined -# in the generated spec file. -TAG := HEAD -CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs -RPMBUILD := rpmbuild -CVS_RSH := ssh - # By default, the naming convention for built RPMS is # --...rpm # Set PLDISTRO on the command line to differentiate between downstream @@ -25,6 +18,9 @@ PLDISTRO := planetlab include $(PLDISTRO).mk +RPMBUILD ?= rpmbuild +CVS_RSH ?= ssh + ifeq ($(findstring $(package),$(ALL)),) # Build all packages @@ -51,7 +47,7 @@ CVSROOT := $(if $($(package)-CVSROOT),$($(package)-CVSROOT),$(CVSROOT)) TAG := $(if $($(package)-TAG),$($(package)-TAG),$(TAG)) MODULE := $($(package)-MODULE) SPEC := $($(package)-SPEC) -RPMFLAGS := $($(package)-RPMFLAGS) +RPMFLAGS := $(if $($(package)-RPMFLAGS),$($(package)-RPMFLAGS),$(RPMFLAGS)) RPMBUILD := $(if $($(package)-RPMBUILD),$($(package)-RPMBUILD),$(RPMBUILD)) CVS_RSH := $(if $($(package)-CVS_RSH),$($(package)-CVS_RSH),$(CVS_RSH)) -- 2.43.0