[vlc-commits] build: set automake flavour to foreign to avoid dirty tricks.

[Diego Elio Pettenò]

vlc | branch: master | Diego Elio Pettenò <flameeyes at flameeyes.eu> | Tue Sep  4 07:38:58 2012 -0700| [1ce6c073f44188cb57f557510975148d8f159337] | committer: Rafaël Carré

build: set automake flavour to foreign to avoid dirty tricks.

Using the foreign flavour you can forego the ABOUT-NLS file as well as
keep the custom INSTALL file.

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ce6c073f44188cb57f557510975148d8f159337
---

 bootstrap    |    8 +-------
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index 1eaa566..415b1c8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -75,14 +75,8 @@ set -x
 ###  classic bootstrap stuff
 ###
 
-# Automake complains if these are not present
-echo > ABOUT-NLS
-cp -f INSTALL INSTALL.git
-
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template ABOUT-NLS
-echo > ABOUT-NLS
-mv -f INSTALL.git INSTALL
+rm -f po/Makevars.template
 
 ##
 ##  files which need to be regenerated
diff --git a/configure.ac b/configure.ac
index 23f4442..5fe1f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_PRESERVE_HELP_ORDER
 
-AM_INIT_AUTOMAKE(tar-ustar color-tests)
+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
 AM_CONFIG_HEADER(config.h)
 
 # Disable with "./configure --disable-silent-rules" or "make V=1"