move automake's "foreign" switch to the proper place

2025-08-26 15:02:56 +02:00 · 2017-12-26 22:58:37 +01:00
parent 1dc7e185bf
commit 84ccb7d2a7
4 changed files with 2 additions and 7 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data

 locale-update:
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,4 +12,4 @@ aclocal --force
 libtoolize --force
 autoconf --force
 autoheader  --force
-automake --add-missing --force-missing --foreign
+automake --add-missing --force-missing
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Tuxbox-Neutrino,3.7.1)
-AM_INIT_AUTOMAKE([1.0.1 nostdinc])
+AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])

 AC_DEFINE(RELEASE_CYCLE, "2.4", [Release cycle information; used in update code])
--- a/src/zapit/Makefile.am
+++ b/src/zapit/Makefile.am
@@ -1,4 +1 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
-