build: set automake flavour to foreign to avoid dirty tricks.
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>
Tue, 4 Sep 2012 14:38:58 +0000 (07:38 -0700)
committerRafaël Carré <funman@videolan.org>
Mon, 10 Sep 2012 08:49:52 +0000 (10:49 +0200)
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@videolan.org>
bootstrap
configure.ac

index 1eaa566..415b1c8 100755 (executable)
--- 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
index 23f4442..5fe1f5a 100644 (file)
@@ -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"