From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 6 Jul 2006 20:54:41 +0000 (+0000)
Subject: - merge revision 1.26
X-Git-Tag: myplc-0_4-rc1~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=039136bcdb3a9401bfeb95a0aeef92abc41206f3;p=build.git

- merge revision 1.26
date: 2006/07/06 20:54:19;  author: mlhuang;  state: Exp;  lines: +1 -1
- fix Sticky Tag regexp
---

diff --git a/planetlab.mk b/planetlab.mk
index 8fbe0c1b..a2a6cad5 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: planetlab.mk,v 1.26 2006/07/06 20:54:19 mlhuang Exp $
 #
 
 #
@@ -30,7 +30,7 @@
 
 ifneq ($(wildcard CVS/Root),)
 CVSROOT := $(shell cat CVS/Root)
-TAG := $(shell cvs status Makefile | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\(.*\)/\1/p')
+TAG := $(shell cvs status planetlab.mk | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\([^[:space:]]*\).*/\1/p')
 ifeq ($(TAG),(none))
 TAG := HEAD
 endif