commit c63f8decb1b455cd4e6942e6fea314eb90631aad
parent c15eefe5bd6b62ecafe685276ecea76c01c3160c
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Sun, 27 Apr 2025 00:25:45 +0200
detect version
Diffstat:
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
@@ -2,7 +2,6 @@ all: server cli
SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' ./cmd/taldir-server))
TALER_DIRECTORY_HOME=${datadir}/taler-directory
-VERSION=`git describe --tags`
server:
${GO} build -o taler-directory -ldflags "-X main.version=${VERSION} -X main.taldirdatahome=${TALER_DIRECTORY_HOME}" ./cmd/taldir-server
diff --git a/configure b/configure
@@ -12,6 +12,21 @@ standard_flags="ARFLAGS BISONFLAGS CFLAGS CXXFLAGS CPPFLAGS FLEXFLAGS INSTALLFLA
standard_vars="INSTALL_DATA INSTALL_PROGRAM INSTALL_SCRIPT"
generated_comment="# This file was generated by configure. DO NOT edit it directly."
+
+if [ -d ".git" ]; then
+ detected_version=`git describe --tags`
+ detected_version=${detected_version:1}
+else
+ dirnm=${PWD##*/}
+ dirnm=${dirnm:-/}
+ detected_version=${dirn#*-}
+ if [ $detected_version = $dirnm ]; then
+ detected_version="unknown"
+ fi
+fi
+
+echo "Configuring ${pkg_name}-${detected_version}"
+
# Save arguments
cat > config.status <<EOF
#!/bin/sh
@@ -143,6 +158,7 @@ cat > Makefile <<EOF
$generated_comment
SHELL = /bin/sh
VPATH = ${var_srcdir}
+VERSION = ${detected_version}
srcdir = ${var_srcdir}
prefix = ${var_prefix:-/usr/local}