aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-07 12:13:34 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-07 12:13:34 -0800
commit459a865ecfd949e7819c7674d3b450a1d1182d05 (patch)
tree17867926f262c0af2b92a66c5a03dc32d17059fb
parentf4cc3c07ffbdc3e2a429df556beb480a78988cfe (diff)
downloadsyslinux.git-459a865ecfd949e7819c7674d3b450a1d1182d05.tar.gz
syslinux.git-459a865ecfd949e7819c7674d3b450a1d1182d05.tar.xz
syslinux.git-459a865ecfd949e7819c7674d3b450a1d1182d05.zip
sysdump: *actually* generate the proper version string
Make the gen-id.sh script actually do the right thing... Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--com32/sysdump/Makefile9
-rwxr-xr-xgen-id.sh5
2 files changed, 10 insertions, 4 deletions
diff --git a/com32/sysdump/Makefile b/com32/sysdump/Makefile
index 4ac235a8..bffee3a2 100644
--- a/com32/sysdump/Makefile
+++ b/com32/sysdump/Makefile
@@ -17,6 +17,7 @@
topdir = ../..
include ../MCONFIG
+-include $(topdir)/version.mk
LIBS = ../libutil/libutil_com.a ../lib/libcom32.a $(LIBGCC)
LNXLIBS = ../libutil/libutil_lnx.a
@@ -24,13 +25,17 @@ LNXLIBS = ../libutil/libutil_lnx.a
MODULES = sysdump.c32
TESTFILES =
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+SRCS = $(wildcard *.c)
+OBJS = $(patsubst %.c,%.o,$(SRCS))
# The DATE is set on the make command line when building binaries for
# official release. Otherwise, substitute a hex string that is pretty much
# guaranteed to be unique to be unique from build to build.
+ifndef HEXDATE
+HEXDATE := $(shell $(PERL) $(topdir)/now.pl $(SRCS) $(wildcard *.h))
+endif
ifndef DATE
-DATE := $(shell sh ../gen-id.sh $(VERSION) $(HEXDATE))
+DATE := $(shell sh $(topdir)/gen-id.sh $(VERSION) $(HEXDATE))
endif
CFLAGS += -DDATE='"$(DATE)"'
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