X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=75eea49efa5de24659890424fbb6a70b343f4a41;hp=9c245616ebc8e0ad4b1ac1483e7f32e236062548;hb=1a7a9078c093f77950192c32be009bbe463fe372;hpb=b109e8b16488f9bbfdc4aefe0e9b00c4f202e905

diff --git a/Makefile.am b/Makefile.am
index 9c245616..75eea49e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui test
+SUBDIRS =  src doc gui test
 
 ACLOCAL_AMFLAGS = -I m4 
 
@@ -11,13 +11,13 @@ 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:
-	-git describe && autoconf --force
+	-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
@@ -31,5 +31,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