summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAkim Demaille <akim@epita.fr>2002-01-24 17:30:58 +0000
committerAkim Demaille <akim@epita.fr>2002-01-24 17:30:58 +0000
commitfa4c430e6e82c616306af411aeff6b4c8c1a0aea (patch)
tree57ecd8c7e5eba0cddfd304bd21a6c5d9961c708a /Makefile.am
parenteb93e2e245d2b5fae65512052b883f824ae252dd (diff)
downloadautoconf-fa4c430e6e82c616306af411aeff6b4c8c1a0aea.tar.gz
* Makefile.am (AUTOMAKE_OPTIONS): 1.5b.
* config/auxdir.m4, config/cond.m4, config/depend.m4, * config/init.m4, config/install-sh.m4, config/lispdir.m4, * config/missing.m4, config/sanity.m4, config/select.m4, * config/strip.m4: Remove, to ease sync'ing with any version of Automake.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am11
1 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 94adda7e..4ef70a49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to create Makefile.in. -*-Makefile-*-
## Makefile for Autoconf.
-## Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+## Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -18,21 +18,16 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-AUTOMAKE_OPTIONS = check-news 1.5 dist-bzip2 readme-alpha
+AUTOMAKE_OPTIONS = check-news 1.5b dist-bzip2 readme-alpha
SUBDIRS = . lib bin config man doc tests
-## There is currently no means with Automake not to run aclocal.
-ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
+ACLOCAL_AMFLAGS = -I config
EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
BUGS \
GNUmakefile Makefile.maint
-# Automake is unable to look into our special aclocal.m4...
-AMTAR = @AMTAR@
-AWK = @AWK@
-
MAINTAINERCLEANFILES = COPYING INSTALL
## -------------------- ##