From 872119b16c770b1b98f90628dcfcd3587c2f324c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 13 Aug 2003 21:04:12 +0000 Subject: [PATCH] fastjar.texi: License manual under the GPL. 2003-08-13 Matthias Klose * fastjar.texi: License manual under the GPL. * Makefile.am: Remove reference to fdl.texi * Makefile.in: Regenerate From-SVN: r70414 --- fastjar/ChangeLog | 6 +++++ fastjar/Makefile.am | 1 - fastjar/Makefile.in | 56 +++++++------------------------------------- fastjar/fastjar.texi | 54 +++++++++--------------------------------- 4 files changed, 26 insertions(+), 91 deletions(-) diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index f1db5e672d1..2653d1725e3 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,9 @@ +2003-08-13 Matthias Klose + + * fastjar.texi: License manual under the GPL. + * Makefile.am: Remove reference to fdl.texi + * Makefile.in: Regenerate + 2003-07-29 Nathanael Nerode * mkinstalldirs: Import autoconf 2.57 / automake 1.7 version. diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index 74f491e850c..fa31b9235fb 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -62,7 +62,6 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex info_TEXINFOS = fastjar.texi fastjar_TEXINFOS = \ ../gcc/doc/include/gcc-common.texi \ - ../gcc/doc/include/fdl.texi \ ../gcc/doc/include/gpl.texi man_MANS = jar.1 grepjar.1 EXTRA_DIST = $(man_MANS) diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index fe294dcd42f..b79a3ade06e 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -80,40 +80,7 @@ AUTOMAKE_OPTIONS = no-dependencies # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. -AM_MAKEFLAGS = \ - "AR_FLAGS=$(AR_FLAGS)" \ - "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ - "CFLAGS=$(CFLAGS)" \ - "CXXFLAGS=$(CXXFLAGS)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ - "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ - "JC1FLAGS=$(JC1FLAGS)" \ - "LDFLAGS=$(LDFLAGS)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ - "MAKE=$(MAKE)" \ - "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ - "PICFLAG=$(PICFLAG)" \ - "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ - "SHELL=$(SHELL)" \ - "exec_prefix=$(exec_prefix)" \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "prefix=$(prefix)" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ - "CXX=$(CXX)" \ - "LD=$(LD)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "NM=$(NM)" \ - "PICFLAG=$(PICFLAG)" \ - "RANLIB=$(RANLIB)" \ - "DESTDIR=$(DESTDIR)" +AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "JC1FLAGS=$(JC1FLAGS)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)" INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include @@ -121,14 +88,12 @@ INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include LIBIBERTY = ../libiberty/libiberty.a bin_PROGRAMS = jar grepjar -jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h \ -zipfile.h dostime.h compress.h pushback.h +jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h jar_LDADD = $(ZLIBS) $(LIBIBERTY) jar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY) -grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h \ -zipfile.h dostime.h compress.h pushback.h +grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h grepjar_LDADD = $(ZLIBS) $(LIBIBERTY) grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY) @@ -137,10 +102,7 @@ AM_CFLAGS = @fastjar_warn_cflags@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex info_TEXINFOS = fastjar.texi -fastjar_TEXINFOS = \ - ../gcc/doc/include/gcc-common.texi \ - ../gcc/doc/include/fdl.texi \ - ../gcc/doc/include/gpl.texi +fastjar_TEXINFOS = ../gcc/doc/include/gcc-common.texi ../gcc/doc/include/gpl.texi man_MANS = jar.1 grepjar.1 EXTRA_DIST = $(man_MANS) @@ -185,7 +147,7 @@ missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(jar_SOURCES) $(grepjar_SOURCES) OBJECTS = $(jar_OBJECTS) $(grepjar_OBJECTS) @@ -369,7 +331,7 @@ uninstall-info: else ii=; fi; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - test -z "$ii" \ + test -z "$$ii" \ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) @@ -464,7 +426,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) mostlyclean-tags: diff --git a/fastjar/fastjar.texi b/fastjar/fastjar.texi index b7c1259f05a..e033da8b400 100644 --- a/fastjar/fastjar.texi +++ b/fastjar/fastjar.texi @@ -32,35 +32,19 @@ @end format @c man begin COPYRIGHT -Copyright (C) @value{copyrights-fastjar} Free Software Foundation, Inc. +Copyright (C) @value{copyrights-fastjar} Matthias Klose Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. A copy of the license is included in the @c man end -section entitled -``GNU Free Documentation License''. +section entitled ``GNU General Public License''. @ignore @c man begin COPYRIGHT -man page gfdl(7). +man page gpl(7). @c man end @end ignore - -@c man begin COPYRIGHT - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. -@c man end @end ifinfo @titlepage @@ -69,7 +53,7 @@ man page gfdl(7). @page @vskip 0pt plus 1filll -Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc. +Copyright @copyright{} @value{copyrights-gcj} Matthias Klose @sp 2 For the @value{which-gcj} Version* @sp 1 @@ -78,22 +62,10 @@ Published by the Free Software Foundation @* Boston, MA 02111-1307, USA@* @sp 1 Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. A copy of the license is included in the +section entitled ``GNU General Public License''. @end titlepage @contents @page @@ -108,8 +80,6 @@ This manual describes how to use @command{jar} and @command{grepjar}. * Invoking jar:: Options supported by @command{jar} * Invoking grepjar:: Options supported by @command{grepjar} * Copying:: The GNU General Public License -* GNU Free Documentation License:: - How you can share and copy this manual @end menu @node Invoking jar @@ -260,6 +230,4 @@ Print version number, then exit. @include gpl.texi -@include fdl.texi - @bye -- 2.30.2