Include example and website directories in release tarballs.

6 files changed, 59 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index c5c4fa4..c26f492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/Makefile
-/Makefile.in
+Makefile
+Makefile.in
 /aclocal.m4
 /autom4te.cache/
 /build-aux/
diff --git a/Makefile.am b/Makefile.am
index a98088c..e3abdd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,3 +63,7 @@ SOURCES =					\
 EXTRA_DIST +=					\
   pre-inst-env.in				\
   README.md
+
+SUBDIRS =					\
+  example					\
+  website
diff --git a/configure.ac b/configure.ac
index e60e097..46b186c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability foreign])
 AM_SILENT_RULES([yes])
 
-AC_CONFIG_FILES([Makefile haunt/config.scm])
+AC_CONFIG_FILES([Makefile example/Makefile website/Makefile haunt/config.scm])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
 AC_CONFIG_FILES([scripts/haunt], [chmod +x scripts/haunt])
 
diff --git a/example/Makefile.am b/example/Makefile.am
new file mode 100644
index 0000000..eb2ed9a
--- /dev/null
+++ b/example/Makefile.am
@@ -0,0 +1,24 @@
+## Haunt --- Static site generator for GNU Guile
+## Copyright © 2015 David Thompson <davet@gnu.org>
+##
+## This file is part of Haunt.
+##
+## Haunt is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## Haunt is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Haunt.  If not, see <http://www.gnu.org/licenses/>.
+
+exampledir = $(pkgdatadir)/example
+nobase_dist_example_DATA =			\
+  haunt.scm					\
+  images/guile-banner.small.png			\
+  posts/foo.sxml				\
+  posts/bar.html
diff --git a/website/Makefile b/website/Makefile
deleted file mode 100644
index dab5ed1..0000000
--- a/website/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-publish:
-	rsync -P -rvz --delete site/ blog@dthompson.us:/var/www/haunt --cvs-exclude
diff --git a/website/Makefile.am b/website/Makefile.am
new file mode 100644
index 0000000..a1dc031
--- /dev/null
+++ b/website/Makefile.am
@@ -0,0 +1,28 @@
+## Haunt --- Static site generator for GNU Guile
+## Copyright © 2015 David Thompson <davet@gnu.org>
+##
+## This file is part of Haunt.
+##
+## Haunt is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## Haunt is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Haunt.  If not, see <http://www.gnu.org/licenses/>.
+
+dist_noinst_DATA =			        \
+  haunt.scm					\
+  css/main.css					\
+  css/reset.css					\
+  images/haunt.png				\
+  js/piwik.js					\
+  posts/0.1-release.sxml
+
+publish:
+	rsync -P -rvz --delete site/ blog@dthompson.us:/var/www/haunt --cvs-exclude