- 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 8fbe0c1..a2a6cad 100644 (file)
--- 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