X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=8d05fb93f157afd6a8f973ad36353df916360b71;hb=9ca1750245b28ed8306f150b6371139c656be111;hp=d2e6f3fa568c424c51810bcf024443e451006b54;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=tinc

diff --git a/Makefile.am b/Makefile.am
index d2e6f3fa..8d05fb93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,20 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui
-
-ACLOCAL_AMFLAGS = -I m4 
+SUBDIRS =  src doc gui test
 
 EXTRA_DIST = COPYING.README README.android
 
+# If git describe works, force autoconf to run in order to make sure we have the
+# current version number from git in the resulting configure script.
+configure-version:
+	-cd $(srcdir) && git describe && autoconf --force
+
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
+
 ChangeLog:
-	git log > ChangeLog
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -23,5 +29,5 @@ release:
 	rm -f ChangeLog
 	$(MAKE) ChangeLog
 	echo "Please edit the NEWS file now..."
-	/usr/bin/editor NEWS
+	/usr/bin/editor $(srcdir)/NEWS
 	$(MAKE) dist