diff options
| author | Eric Blake <ebb9@byu.net> | 2008-11-04 09:48:27 -0700 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-11-04 09:48:27 -0700 |
| commit | 4d5741bdd992359d147b491ccded2d65c887425d (patch) | |
| tree | e7f420ecd13153917cfbd2cdcaef9728768a437c | |
| parent | 85848c00f2f6547c1f6416b0441c749e7658471c (diff) | |
| download | m4-4d5741bdd992359d147b491ccded2d65c887425d.tar.gz | |
Upgrade to FDL 1.3.
* ltdl/m4/gnulib-cache.m4: Replace fdl module with fdl-1.3.
* Makefile.am (doc_m4_TEXINFOS, MAINTAINERCLEANFILES): Reflect
file change.
* doc/m4.texinfo (GNU Free Documentation License): Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | doc/.cvsignore | 2 | ||||
| -rw-r--r-- | doc/.gitignore | 2 | ||||
| -rw-r--r-- | doc/m4.texinfo | 2 | ||||
| -rw-r--r-- | ltdl/m4/gnulib-cache.m4 | 4 |
6 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2008-11-04 Eric Blake <ebb9@byu.net> + + Upgrade to FDL 1.3. + * ltdl/m4/gnulib-cache.m4: Replace fdl module with fdl-1.3. + * Makefile.am (doc_m4_TEXINFOS, MAINTAINERCLEANFILES): Reflect + file change. + * doc/m4.texinfo (GNU Free Documentation License): Likewise. + 2008-10-22 Eric Blake <ebb9@byu.net> Give nicer error if user modifies testsuite but lacks autoconf. diff --git a/Makefile.am b/Makefile.am index 92c67451..8f820f68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -250,11 +250,11 @@ EXTRA_DIST += m4/system_.h ## -------------- ## info_TEXINFOS = doc/m4.texinfo -doc_m4_TEXINFOS = doc/regexprops-generic.texi doc/fdl.texi doc/gpl-3.0.texi +doc_m4_TEXINFOS = doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi dist_man_MANS = $(srcdir)/doc/m4.1 EXTRA_DIST += $(config_aux_dir)/gendocs.sh doc/gendocs_template MAINTAINERCLEANFILES += $(config_aux_dir)/gendocs.sh doc/gendocs_template \ - doc/fdl.texi + doc/fdl-1.3.texi HELP2MAN = $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run help2man # Build the man page once in the srcdir, rather than in every VPATH build diff --git a/doc/.cvsignore b/doc/.cvsignore index 18562f39..91275d6f 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -14,7 +14,7 @@ *.tp *.vr .dirstamp -fdl.texi +fdl-1.3.texi gendocs_template gpl-3.0.texi Makefile.in diff --git a/doc/.gitignore b/doc/.gitignore index 18562f39..91275d6f 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -14,7 +14,7 @@ *.tp *.vr .dirstamp -fdl.texi +fdl-1.3.texi gendocs_template gpl-3.0.texi Makefile.in diff --git a/doc/m4.texinfo b/doc/m4.texinfo index cb31fb4f..d14d514a 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -9769,7 +9769,7 @@ permissive license is in effect when copying just the examples. @cindex FDL, GNU Free Documentation License @cindex GNU Free Documentation License @cindex Free Documentation License (FDL), GNU -@include fdl.texi +@include fdl-1.3.texi @node Indices @appendix Indices of concepts and macros diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 index 64ef86b9..2058ded8 100644 --- a/ltdl/m4/gnulib-cache.m4 +++ b/ltdl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat flexmember fopen fopen-safer fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io vasnprintf-posix verify verror xalloc xalloc-die xmemdup0 xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io vasnprintf-posix verify verror xalloc xalloc-die xmemdup0 xprintf-posix xstrndup xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([local]) @@ -33,7 +33,7 @@ gl_MODULES([ dirname error exit - fdl + fdl-1.3 fflush filenamecat flexmember |