commit c724b3877a4d67e6ed377df84e454ec11d6c4f1c
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Mar 17 22:54:33 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Mar 17 22:54:33 2011 +0000

    Add back -a option to automake, and remove INSTALL if automake installs
    it.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2305
---
 autogen.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 193ae3cd..d9cbcfca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,26 @@
 #!/bin/sh

+if [ -e INSTALL ]; then
+    have_INSTALL=true
+else
+    have_INSTALL=false
+fi
+
 mkdir autotools

 aclocal
 autoheader
-automake
+automake -ac
 autoconf
 automake

+# The INSTALL file is autogenerated, so it isn't stored in version control.
+# As the file isn't present, automake's -a option will install generic
+# install instructions.  So remove INSTALL if automake installed one.
+
+if ! $have_INSTALL; then
+    rm -f INSTALL
+fi
+
 ./configure "$@"