summaryrefslogtreecommitdiff
path: root/gen-id.sh
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-08 14:39:20 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-08 14:39:20 -0800
commitcbbf4aa64d4f7f6d0e3d94b8114a19c0a2ec77ff (patch)
treef95d95d54790321e1db19208bea61dd4d2564224 /gen-id.sh
parentaddaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa (diff)
parent60701611cfd3242f5ed4dc8fa985477eb53ad202 (diff)
downloadsyslinux-3.85-pre63.tar.gz
Merge branch 'master' into i915ressyslinux-3.85-pre63
Diffstat (limited to 'gen-id.sh')
-rwxr-xr-xgen-id.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/gen-id.sh b/gen-id.sh
index 1b3e108b..301ea4eb 100755
--- a/gen-id.sh
+++ b/gen-id.sh
@@ -8,9 +8,10 @@
#
ver="$1"
-tim="$1"
+tim="$2"
+top=`dirname "$0"`
-if test -n "$GIT_DIR" -o -d ../.git -o -f ../.git; then
+if test -n "$GIT_DIR" -o -d "$top"/.git -o -f "$top"/.git; then
id="$(git describe)"
if test -n "$id"; then
if test x"$(echo "$id" | cut -d- -f1)" = xsyslinux; then