summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcypherpunks <cypherpunks@torproject.org>2015-03-12 09:28:41 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-14 13:00:06 -0400
commite85ba7459e6270b5ec1186a18e87a60c13153344 (patch)
tree6b90d3e384f284234bbddd706d3e4d019b07d610
parentce9bd4e04ce54b6b001c096f7caab2d0beaef941 (diff)
downloadtor-e85ba7459e6270b5ec1186a18e87a60c13153344.tar.gz
tor-e85ba7459e6270b5ec1186a18e87a60c13153344.zip
Revive updateVersions.pl with `make update-versions`.
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rwxr-xr-xscripts/maint/updateVersions.pl.in (renamed from scripts/maint/updateVersions.pl)6
3 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 4527dd1244..1c2d2c1909 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,6 +122,10 @@ check-changes:
$(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes/*; \
fi
+.PHONY: update-versions
+update-versions:
+ $(PERL) $(top_builddir)/scripts/maint/updateVersions.pl
+
version:
@echo "Tor @VERSION@"
@if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; then \
diff --git a/configure.ac b/configure.ac
index 3ba686802a..4905e69cb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1664,6 +1664,7 @@ AC_CONFIG_FILES([
src/config/torrc.sample
src/config/torrc.minimal
scripts/maint/checkOptionDocs.pl
+ scripts/maint/updateVersions.pl
])
if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then
diff --git a/scripts/maint/updateVersions.pl b/scripts/maint/updateVersions.pl.in
index 15c83b80a7..65c51a1f2d 100755
--- a/scripts/maint/updateVersions.pl
+++ b/scripts/maint/updateVersions.pl.in
@@ -1,8 +1,8 @@
#!/usr/bin/perl -w
-$CONFIGURE_IN = './configure.ac';
-$ORCONFIG_H = './src/win32/orconfig.h';
-$TOR_NSI = './contrib/win32build/tor-mingw.nsi.in';
+$CONFIGURE_IN = '@abs_top_srcdir@/configure.ac';
+$ORCONFIG_H = '@abs_top_srcdir@/src/win32/orconfig.h';
+$TOR_NSI = '@abs_top_srcdir@/contrib/win32build/tor-mingw.nsi.in';
$quiet = 1;