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

diff --git a/ChangeLog b/ChangeLog
index f4c2ec124b745dc36c71f99b2b7722050c92bf7a..1757ce36007da560f3756b8f03793b62565b46c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Sep 25 16:11:09 2005  Ben Pfaff  <blp@gnu.org>
+
+       * Makefile.am: Handles `examples' as a subdirectory instead of a
+       dist-hook.  The dist-hook copied examples/CVS into the
+       distribution.  Thanks to James R. Van Zandt <jrvz@comcast.net> for
+       reporting the problem.
+
 Mon Sep 19 10:24:10 2005  Ben Pfaff  <blp@gnu.org>
 
        * Smake: Add `check' target for convenience.  Add

diff --git a/Makefile.am b/Makefile.am
index 54922040195f4e31ab1112b0f2da783dbf11aa62..79610abea8643df419a5bc128b232cac024371f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,10 @@
 
 AUTOMAKE_OPTIONS = gnits 1.7
 
-SUBDIRS = m4 intl doc lib gl src po config tests 
+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.

diff --git a/configure.ac b/configure.ac
index 818fb4b8aed86cab5a4b48595afe5d6d2480eda4..ca647eb06661a11c9c00c4d40f5c6fe3dd4c8854 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,8 @@ AC_CONFIG_FILES([Makefile m4/Makefile gl/Makefile intl/Makefile po/Makefile.in
                 doc/Makefile 
                 src/Makefile src/expressions/Makefile
                 config/Makefile
-                tests/Makefile])
+                tests/Makefile
+                examples/Makefile])
 AC_CONFIG_COMMANDS([pref.h],[
           # Copy pref.h from pref.h.orig if prudent
           if test ! -f pref.h; then

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d8386fe2d96e685c2f66ea570b8ad0ba829dfee9..2973f49bfbebff700d0e817e5bb109a5b577461f 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 25 16:10:36 2005  Ben Pfaff  <blp@gnu.org>
+
+       * Makefile.am: Make ni.texi a prereq for HTML output.  Thanks to
+       James R. Van Zandt <jrvz@comcast.net> for reporting the problem.
+
 Sun Jul 24 18:47:02 2005  Ben Pfaff  <blp@gnu.org>
 
        * portable-file-format.texi: Describe author field.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 65e7a6dffb9dbf1e210717430c872d121b45d3f5..0ff30a48bdb4ca0122bec872dd7d3b51b7aaa113 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -43,5 +43,5 @@ ni.texi: @top_srcdir@/src/command.def @srcdir@/get-commands.pl
 
 
 $(INFO_DEPS): ni.texi
-
+$(HTML_DEPS): ni.texi
 

diff --git a/examples/.cvsignore b/examples/.cvsignore
new file mode 100644 (file)
index 0000000..70845e0
--- /dev/null
+++ b/examples/.cvsignore
@@ -0,0 +1 @@
+Makefile.in

diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644 (file)
index 0000000..b2da778
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in  -*- makefile -*-
+
+EXTRA_DIST = descript.stat