From: Ben Pfaff <blp@gnu.org> Date: Sun, 25 Sep 2005 23:23:10 +0000 (+0000) Subject: Fix two minor packaging bugs reported by James R. Van Zandt. X-Git-Tag: v0.6.0~1217 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3912bd1b44a4fa8dc28c873ddec7915045d0c55e;p=pspp-builds.git Fix two minor packaging bugs reported by James R. Van Zandt. --- diff --git a/ChangeLog b/ChangeLog index f4c2ec12..1757ce36 100644 --- 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 54922040..79610abe 100644 --- 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 818fb4b8..ca647eb0 100644 --- 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 d8386fe2..2973f49b 100644 --- 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 65e7a6df..0ff30a48 100644 --- 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 index 00000000..70845e08 --- /dev/null +++ b/examples/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/examples/Makefile.am b/examples/Makefile.am new file mode 100644 index 00000000..b2da7785 --- /dev/null +++ b/examples/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in -*- makefile -*- + +EXTRA_DIST = descript.stat