From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Nov 2011 04:53:18 +0000 (-0500)
Subject: Basic support for a "make version" target to declare the source version
X-Git-Tag: tor-0.2.3.9-alpha~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916aa8022d8bafac86966b71fb5b43f20cf91ccd;p=thirdparty%2Ftor.git

Basic support for a "make version" target to declare the source version

This is katmagic's idea.  See issue 4400.
---

diff --git a/Makefile.am b/Makefile.am
index cd0d8833c6..b8d18d4c0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,3 +70,10 @@ check-logs:
 	./contrib/checkLogs.pl                        \
 		src/*/*.[ch] | sort -n
 
+version:
+	@echo "Tor @VERSION@"
+	@if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; then \
+	   echo -n "git: " ;\
+	   (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \
+	fi
+
diff --git a/changes/make_version b/changes/make_version
new file mode 100644
index 0000000000..b736a875ef
--- /dev/null
+++ b/changes/make_version
@@ -0,0 +1,4 @@
+  o Minor features (build):
+    - Running "make version" now displays the version of Tor that
+      we're about to build. Idea from katmagic; resolves issue 4400.
+