summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2010-10-20 06:13:17 +0200
committerGuillem Jover <guillem@hadrons.org>2010-10-21 05:28:25 +0200
commitc4e18a326c5835115c00ccccd27bb310b40a4839 (patch)
tree23ab931335daf736155ffa5dd1db8a2fb36aaba1
parent2abc766502164aa39988d7c759f71b908b6c6327 (diff)
build: Move foreign setting from AUTOMAKE_OPTIONS to AM_INIT_AUTOMAKE
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 95892da..c867416 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README ChangeLog
MAINTAINERCLEANFILES = ChangeLog
diff --git a/configure.ac b/configure.ac
index d9bb1c5..d98dbe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE