diff options
| author | Jan Engelhardt | 2013-12-10 17:02:05 +0100 |
|---|---|---|
| committer | Jan Engelhardt | 2013-12-10 17:02:59 +0100 |
| commit | f5396cf3c7d90ddb54c96be0a2c7ed6d41d21d10 (patch) | |
| tree | e66062036a59e37b62624a54d656df9ea94c3993 | |
| parent | d44fdfaeee2f4be129c0e2d87ba460fc308e4274 (diff) | |
| download | chocolate-doom-f5396cf3c7d90ddb54c96be0a2c7ed6d41d21d10.tar.gz chocolate-doom-f5396cf3c7d90ddb54c96be0a2c7ed6d41d21d10.tar.bz2 chocolate-doom-f5396cf3c7d90ddb54c96be0a2c7ed6d41d21d10.zip | |
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.
| -rwxr-xr-x | autogen.sh | 15 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 16 deletions
@@ -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/'` |