From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 15 Dec 2011 09:21:13 +0000 (+0100)
Subject: mk_version.tcl: read version from IDMETA
X-Git-Tag: v2.0.51~17
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;p=idzebra-moved-to-github.git

mk_version.tcl: read version from IDMETA
---

diff --git a/util/mk_version.tcl b/util/mk_version.tcl
index 4bee1a4..9aee3c0 100644
--- a/util/mk_version.tcl
+++ b/util/mk_version.tcl
@@ -1,7 +1,7 @@
 #!/usr/bin/tclsh
 
 proc usage {} {
-    puts {mk_version.tcl [-v] configure.ac infile ..}
+    puts {mk_version.tcl [-v] IDMETA infile ..}
     exit 1
 }
 
@@ -35,7 +35,7 @@ while {1} {
     if {$cnt < 0} {
 	break
     }
-    regexp {AC_INIT\([^,]+,\[([0-9.]+)\]} $line s version
+    regexp {VERSION=([0-9.]+)} $line s version
 }
 close $f
 
diff --git a/win/makefile b/win/makefile
index f81549b..84906e6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -344,9 +344,9 @@ LINK_PROGRAM= $(LINK) \
 # Generated sources
 generate: $(INCLDIR)\idzebra\version.h
 
-$(INCLDIR)\idzebra\version.h:
+$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA 
 	@cd $(ROOTDIR)\util
-	$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\idzebra\version.h
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h
 
 # Source and object modules
 # Note: Ordinary source files are not specified here at