Fix two minor packaging bugs reported by James R. Van Zandt.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0febcdbba65b5d413e9c35e357459cc0b8efbd78..79610abea8643df419a5bc128b232cac024371f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,10 @@
 
 AUTOMAKE_OPTIONS = gnits 1.7
 
-SUBDIRS = m4 doc intl lib src po config tests
-
-pkgdocdir = $(prefix)/doc/@PACKAGE@
-pkgdoc_DATA = NEWS README TODO
-noinst_DATA = AUTHORS THANKS
+SUBDIRS = m4 intl doc lib gl src po config tests examples
 
 DISTCLEANFILES = pref.h
 
-dist-hook:
-       cp -rp $(top_srcdir)/examples $(distdir)
-
 # A `private installation' in my terms is just having the appropriate
 # configuration files in ~/.pspp instead of a global configuration
 # location.  So I let those files be installed automatically.
@@ -22,9 +15,9 @@ private-install:
 private-uninstall:
        $(MAKE) private-uninstall -C config
 
-EXTRA_DIST = config.rpath  NEWS ONEWS TODO pref.h.orig configure
+EXTRA_DIST = AUTHORS NEWS ONEWS README TODO THANKS config.rpath        \
+mkinstalldirs config.rpath pref.h.orig configure pspp-mode.el
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 
 
-
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4