From: Florian Forster <octo@verplant.org>
Date: Tue, 21 Sep 2010 06:21:38 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collection4
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=36f6513533637fdea37c4097a0baf15c83a90e40;hp=a9177c62be39c0b47777f1d3547fca2612c73003;p=collection4.git

Merge branch 'master' of /var/lib/git/collection4
---

diff --git a/.gitignore b/.gitignore
index 939ad4a..cba320b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,19 @@
+aclocal.m4
+autom4te.cache
+install-sh
+missing
 *.o
 Makefile
 Makefile.in
+ylwrap
 
 /configure
 /config.log
 /config.status
+src/collection.fcgi
+src/config.h.in
 src/config.h
 src/scanner.c
 src/parser.c
 src/parser.h
+src/stamp-h1
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..acccbb2
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -ex
+
+aclocal
+autoconf --force --warnings=all
+autoheader --force --warnings=all
+automake --add-missing --copy --foreign --warnings=all
+
diff --git a/share/Makefile.am b/share/Makefile.am
index 06953f8..091c088 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,6 +1,6 @@
 dist_sysconf_DATA = collection.conf
 
-dist_data_DATA = style.css \
+dist_pkgdata_DATA = style.css \
 		 collection.js \
 		 g.line-min.js \
 		 g.raphael-min.js \
diff --git a/src/Makefile.am b/src/Makefile.am
index bd98699..766331f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ AM_YFLAGS = -d
 
 BUILT_SOURCES = parser.h
 
-bin_PROGRAMS = collection.fcgi
+pkglib_PROGRAMS = collection.fcgi
 
 collection_fcgi_SOURCES = main.c \
 			  oconfig.c oconfig.h aux_types.h scanner.l parser.y \