summaryrefslogtreecommitdiff
path: root/fastjar/Makefile.am
diff options
context:
space:
mode:
authorkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>2003-12-01 02:58:36 +0000
committerkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>2003-12-01 02:58:36 +0000
commitdcb6825a34d25067adeff961a2ae64564c3f107e (patch)
treebf21cc4a0edffc53712c922617461848c59f633d /fastjar/Makefile.am
parent8563bb1cd126ecf748f6477a07db4a4115f7b34f (diff)
downloadgcc-dcb6825a34d25067adeff961a2ae64564c3f107e.tar.gz
fastjar/
2003-12-01 Kelley Cook <kcook@gcc.gnu.org> * Makefile.am: Define AM_MAKINFOFLAGS. Remove Automake 1.4 hack. * Makefile.in: Regenerate with automake 1.7.6 & autoconf 2.57 tools. * aclocal.m4, config.h.in, configure: Likewise. * install-sh, missing, mkinstalldirs, stamp-h.in: Remove. gcc/ 2003-12-01 Kelley Cook <kcook@gcc.gnu.org> * doc/install.texi: Note that fastjar is built with automake 1.7.x and autoconf 2.57. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fastjar/Makefile.am')
-rw-r--r--fastjar/Makefile.am11
1 files changed, 1 insertions, 10 deletions
diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am
index 21629654f4c..3d4ea36c232 100644
--- a/fastjar/Makefile.am
+++ b/fastjar/Makefile.am
@@ -57,6 +57,7 @@ grepjar_LDADD = $(ZLIBS) $(LIBIBERTY)
grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
AM_CFLAGS = @fastjar_warn_cflags@
+AM_MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
info_TEXINFOS = fastjar.texi
@@ -66,16 +67,6 @@ fastjar_TEXINFOS = \
man_MANS = jar.1 grepjar.1
EXTRA_DIST = $(man_MANS)
-## This is a hack. We can't set AM_MAKEINFOFLAGS, since that isn't
-## available in 1.4. Nor can we override or append to MAKEINFO or
-## MAKEINFOFLAGS, since these are overridden by the top-level
-## Makefile. So, we just duplicate the rules. FIXME: remove this
-## when we upgrade automake.
-my_makei_flags += -I $(srcdir)/../gcc/doc/include
-fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
- rm -f $@ $@-[0-9] $@-[0-9][0-9]
- $(MAKEINFO) $(my_makei_flags) -o $@ $<
-
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"