From ef733b48e9f80b42b3bd4aaef3654c3485fac8d5 Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 30 Jun 2009 21:44:48 +0000
Subject: [PATCH] Switch automake handling to use --gnu mode, not --foreign.
 Remove INSTALL file; automake generates a copy of the latest version.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2435 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 INSTALL     | 1 -
 Makefile.am | 5 +++--
 bootstrap   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 1a6ec4ff5..000000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-openocd.texi is the authoritative source of OpenOCD documentation
diff --git a/Makefile.am b/Makefile.am
index ff3317111..dc4166d16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.6
+AUTOMAKE_OPTIONS = gnu 1.6
 
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
@@ -34,7 +34,7 @@ doxygen::
 
 TCL_PATH = tcl
 # command to find paths of script files, relative to TCL_PATH
-TCL_FILES := find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
 		sed -e 's,^$(srcdir)/$(TCL_PATH),,'
 
 dist-hook:
@@ -61,6 +61,7 @@ distclean-local:
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
 	$(srcdir)/configure \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/depcomp \
diff --git a/bootstrap b/bootstrap
index c01b7e488..59f8438a7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -17,7 +17,7 @@ aclocal
 ${libtoolize} --automake --copy
 autoconf
 autoheader
-automake --foreign --add-missing --copy
+automake --gnu --add-missing --copy
 )
 
 # AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode