X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=8d05fb93f157afd6a8f973ad36353df916360b71;hb=3c54765bcdf8bd6114da0cb31f45404950089e3a;hp=d2f9c3b3d77fed4fff7197a907fc588506cd58bc;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=tinc

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b3..8d05fb93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,20 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  src doc gui test
 
-ACLOCAL_AMFLAGS = -I m4 
+EXTRA_DIST = COPYING.README README.android
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+# 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