Changeset 320 in MondoRescue for trunk/tools/mksvnversion

Timestamp:

Jan 15, 2006, 12:29:12 AM (18 years ago)

Author:

bcornec

Message:

merge -r316:319 $SVN_M/branches/2.06

File:

• trunk/tools/mksvnversion (modified) (1 diff)

trunk/tools/mksvnversion

@@ -1 +1 @@
 #!/bin/bash
-########################################################
-# $Id$
-########################################################
 #
 # on every build, record the working copy revision string
 #
-dname=`dirname $0`
-prem=`echo $dname |cut -c1`
-if [ ${prem} == "/" ]; then
-    export TOOLHOME=$dname
-else
-    export TOOLHOME=${PWD}/$dname
+# $Id$
+#
+
+# TOOLHOME should be provided by callers
+if [ _"$TOOLHOME" = _"" ]; then
+    # It's not the case so compute it
+    dname=`dirname $0`
+    prem=`echo $dname |cut -c1`
+    if [ ${prem} == "/" ]; then
+        export TOOLHOME=$dname
+    else
+        export TOOLHOME=${PWD}/$dname
+    fi
 fi
-. $TOOLHOME/rpm-env
 
-#
-# Create a .c file for mondo to link with and get
-# the right build version from SVN
-#
 rel=`svnversion $TOOLHOME/..`
-cat > $TOOLHOME/../mondo/revision.h << EOF
-#define REVISION "${rel}" 
-EOF
+
 cat > $TOOLHOME/../mondo/REVISION << EOF
 ${rel}