Merge 'master' into 'gtk3'.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 28e9ffc6b250078acdc65da2ddebfc1bfee5dd52..a5a7d5c79e94bb789c5f0a3156da65978931648c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ noinst_LTLIBRARIES=
 noinst_PROGRAMS=
 check_PROGRAMS=
 bin_PROGRAMS=
+dist_man_MANS =
 DIST_HOOKS =
 INSTALL_DATA_HOOKS = 
 UNINSTALL_DATA_HOOKS =
@@ -58,6 +59,7 @@ generate-changelog:
 DIST_HOOKS += generate-changelog
 
 
+include $(top_srcdir)/build-aux/automake.mk
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
 include $(top_srcdir)/doc/automake.mk