From f5396cf3c7d90ddb54c96be0a2c7ed6d41d21d10 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Dec 2013 17:02:05 +0100 Subject: build: do not create an INSTALL file If the general-instruction INSTALL file is not desired, just specify so in AUTOMAKE_OPTIONS rather than fiddling with it in autogen.sh. --- autogen.sh | 15 --------------- configure.ac | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/autogen.sh b/autogen.sh index faed544d..0f3d1037 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,11 +1,5 @@ #!/bin/sh -if [ -e INSTALL ]; then - have_INSTALL=true -else - have_INSTALL=false -fi - mkdir -p autotools aclocal @@ -14,13 +8,4 @@ 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 "$@" - diff --git a/configure.ac b/configure.ac index 18c6ccd9..e7e257ec 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) dnl Automake v1.8.0 is required, please upgrade! -AM_INIT_AUTOMAKE([1.8.0]) +AM_INIT_AUTOMAKE([1.8.0 foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION | sed 's/-.*//; s/\./, /g; s/$/, 0/'` -- cgit v1.2.3