Update build system to Autoconf 2.58, Automake 1.7, gettext 0.12.1.

[pspp-builds.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b945ea95444665e5027ff1f9fda892af800ff998..39975a518d4a3f76d456468639b5b51e2e8eb545 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.4
+AUTOMAKE_OPTIONS = gnits 1.7
 
-SUBDIRS = doc intl po lib src config tests
+SUBDIRS = m4 doc intl lib src po config tests
 
 pkgdocdir = $(prefix)/doc/@PACKAGE@
 pkgdoc_DATA = NEWS README TODO
@@ -11,7 +11,6 @@ noinst_DATA = AUTHORS THANKS
 DISTCLEANFILES = pref.h
 
 dist-hook:
-       cp -rp $(top_srcdir)/sysdeps $(distdir)
        cp -rp $(top_srcdir)/examples $(distdir)
 
 # A `private installation' in my terms is just having the appropriate
@@ -23,7 +22,9 @@ private-install:
 private-uninstall:
        $(MAKE) private-uninstall -C config
 
-EXTRA_DIST = NEWS ONEWS TODO pref.h.orig reconfigure configure
+EXTRA_DIST = config.rpath  NEWS ONEWS TODO pref.h.orig reconfigure configure
 
 MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in
 
+
+ACLOCAL_AMFLAGS = -I m4