Don't assume sa.sa_family is a short int.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e37864d..177f549 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = have.h system.h COPYING.README
+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 +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