From c1d33e8bf00ef557c38d364983e502c529356108 Mon Sep 17 00:00:00 2001 From: matsuand <30614168+matsuand@users.noreply.github.com> Date: Tue, 24 Aug 2021 21:11:37 +0900 Subject: [PATCH] =?utf8?q?[lfsja-git]=20r10.1-201=20=E5=AF=BE=E5=BF=9C?= =?utf8?q?=E3=80=82=20GNU=20automake=201.16.4=20=E3=81=B8=E3=81=AE?= =?utf8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile.in | 11 +++--- aclocal.m4 | 62 +++++++++++++++++++------------ configure | 19 +++++++++- ctie/Makefile.in | 10 ++--- src/Makefile.am | 3 +- src/Makefile.in | 13 +++---- src/appendices/Makefile.in | 8 ++-- src/chapter01/Makefile.in | 8 ++-- src/chapter01/changelog.ch | 17 +++++++++ src/chapter01/jchangelog.ch | 11 ++++++ src/chapter02/Makefile.in | 8 ++-- src/chapter03/Makefile.in | 8 ++-- src/chapter04/Makefile.in | 8 ++-- src/chapter05/Makefile.in | 8 ++-- src/chapter06/Makefile.in | 8 ++-- src/chapter07/Makefile.in | 8 ++-- src/chapter07/cleanup.ch | 2 +- src/chapter08/Makefile.in | 8 ++-- src/chapter08/glibc.ch | 8 ++++ src/chapter09/Makefile.in | 8 ++-- src/chapter10/Makefile.in | 8 ++-- src/chapter11/Makefile.in | 8 ++-- src/general.ch | 6 +-- src/part3intro/Makefile.in | 8 ++-- src/prologue/Makefile.in | 8 ++-- src/stylesheets/Makefile.in | 10 ++--- src/stylesheets/lfs-xsl/Makefile.in | 10 ++--- src/stylesheets/lfs-xsl/pdf/Makefile.in | 8 ++-- src/stylesheets/lfs-xsl/xhtml/Makefile.in | 8 ++-- src/udev-lfs/Makefile.in | 10 ++--- src/udev-lfs/contrib/Makefile.in | 10 ++--- src/udev-lfs/contrib/debian/Makefile.in | 8 ++-- version.ac | 4 +- 33 files changed, 220 insertions(+), 122 deletions(-) diff --git a/Makefile.in b/Makefile.in index 46f1e40c..561890eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -155,9 +155,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \ INSTALL NEWS README compile depcomp install-sh missing @@ -217,6 +214,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -225,6 +224,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -458,7 +458,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/aclocal.m4 b/aclocal.m4 index 9a2428cd..19d5b4a6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.3 -*- Autoconf -*- +# generated automatically by aclocal 1.16.4 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.3], [], +m4_if([$1], [1.16.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.3])dnl +[AM_AUTOMAKE_VERSION([1.16.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -400,7 +400,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -464,7 +464,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -516,6 +516,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -597,7 +611,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -618,7 +632,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -640,7 +654,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -675,7 +689,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -718,7 +732,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -752,7 +766,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -781,7 +795,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +842,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -847,7 +861,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -928,7 +942,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -988,7 +1002,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1030,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1035,7 +1049,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/configure b/configure index 31fb76e4..21d63f38 100755 --- a/configure +++ b/configure @@ -665,6 +665,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -2845,6 +2848,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -4720,7 +4737,7 @@ fi -TARGETVER=r10.1-196 +TARGETVER=r10.1-201 (cd ${bookdir} && sh git-version.sh) if test -f ${bookdir}/version.ent; then diff --git a/ctie/Makefile.in b/ctie/Makefile.in index ff879872..1b3abd17 100644 --- a/ctie/Makefile.in +++ b/ctie/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -159,8 +159,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ ChangeLog README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -176,6 +174,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -184,6 +184,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -394,7 +395,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/Makefile.am b/src/Makefile.am index aec47dba..8781017d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,8 +88,7 @@ book: validate profile-html @echo "Copying CSS code and images..." $(MKDIR_P) $(BASEDIR)/stylesheets cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets - pushd $(BASEDIR)/ > /dev/null; \ - popd > /dev/null + sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html $(MKDIR_P) $(BASEDIR)/images cp -p $(BOOKdir)/images/*.png $(BASEDIR)/images diff --git a/src/Makefile.in b/src/Makefile.in index 27e8dcf5..7a0b836d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/userconfig.xml.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,6 +192,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -202,6 +202,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -446,7 +447,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -682,8 +682,7 @@ book: validate profile-html @echo "Copying CSS code and images..." $(MKDIR_P) $(BASEDIR)/stylesheets cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets - pushd $(BASEDIR)/ > /dev/null; \ - popd > /dev/null + sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html $(MKDIR_P) $(BASEDIR)/images cp -p $(BOOKdir)/images/*.png $(BASEDIR)/images diff --git a/src/appendices/Makefile.in b/src/appendices/Makefile.in index 22a7bd8a..8df52fc0 100644 --- a/src/appendices/Makefile.in +++ b/src/appendices/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -285,7 +288,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter01/Makefile.in b/src/chapter01/Makefile.in index 1610f1fc..3ce21ebd 100644 --- a/src/chapter01/Makefile.in +++ b/src/chapter01/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -284,7 +287,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch index aeb46b3d..d32fce40 100644 --- a/src/chapter01/changelog.ch +++ b/src/chapter01/changelog.ch @@ -50,6 +50,23 @@ @z @x + 2021-08-20 + + + [bdubbs] - Add a sed to glibc in Chapter 8 to fix a + critical security issue. + + +@y + 2021-08-20 + + + [bdubbs] - 第 8 章の glibc に対して、 sed 処理により致命的なセキュリティエラーを修正。 + + +@z + +@x 2021-08-18 diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch index 78431bc9..048c3dc2 100644 --- a/src/chapter01/jchangelog.ch +++ b/src/chapter01/jchangelog.ch @@ -59,6 +59,17 @@ --> + 2021-08-24 + + + [matsuand] - + r10.1-201 (763a00a98) までの対応。 + + + + + + 2021-08-20 diff --git a/src/chapter02/Makefile.in b/src/chapter02/Makefile.in index 9cf786de..bebb1360 100644 --- a/src/chapter02/Makefile.in +++ b/src/chapter02/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -285,7 +288,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter03/Makefile.in b/src/chapter03/Makefile.in index 3c6ad586..ccedc001 100644 --- a/src/chapter03/Makefile.in +++ b/src/chapter03/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -281,7 +284,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter04/Makefile.in b/src/chapter04/Makefile.in index fe108ec7..3feef9ee 100644 --- a/src/chapter04/Makefile.in +++ b/src/chapter04/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -284,7 +287,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter05/Makefile.in b/src/chapter05/Makefile.in index 1f1f229d..f306557b 100644 --- a/src/chapter05/Makefile.in +++ b/src/chapter05/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -284,7 +287,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter06/Makefile.in b/src/chapter06/Makefile.in index 20e57225..9ea16deb 100644 --- a/src/chapter06/Makefile.in +++ b/src/chapter06/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -296,7 +299,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter07/Makefile.in b/src/chapter07/Makefile.in index 2a7f15bc..70caa312 100644 --- a/src/chapter07/Makefile.in +++ b/src/chapter07/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -292,7 +295,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter07/cleanup.ch b/src/chapter07/cleanup.ch index 77f71499..77e6f5b9 100644 --- a/src/chapter07/cleanup.ch +++ b/src/chapter07/cleanup.ch @@ -128,7 +128,7 @@ backed up for later reuse. In case of fatal failures in the subsequent chapters, it often turns out that removing everything and starting over (more carefully) is the best option to recover. Unfortunately, all the - the temporary files will be removed, too. To avoid spending extra time to + temporary files will be removed, too. To avoid spending extra time to redo something which has been built successfully, prepare a backup. @y ここまでに、基本的なプログラムやライブラリはすべて作り終えました。 diff --git a/src/chapter08/Makefile.in b/src/chapter08/Makefile.in index e71bd2d4..008dddd2 100644 --- a/src/chapter08/Makefile.in +++ b/src/chapter08/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -361,7 +364,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter08/glibc.ch b/src/chapter08/glibc.ch index 4f820798..50881a93 100644 --- a/src/chapter08/glibc.ch +++ b/src/chapter08/glibc.ch @@ -28,6 +28,14 @@ @z @x + First, fix a security problem identified upstream: +@y + + はじめに、アップストリームが認識しているセキュリティ問題を修正します。 + +@z + +@x Some of the Glibc programs use the non-FHS compliant /var/db directory to store their runtime data. Apply the following patch to make such programs diff --git a/src/chapter09/Makefile.in b/src/chapter09/Makefile.in index a5bc7962..a469db05 100644 --- a/src/chapter09/Makefile.in +++ b/src/chapter09/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -293,7 +296,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter10/Makefile.in b/src/chapter10/Makefile.in index f29ad9fa..bef20936 100644 --- a/src/chapter10/Makefile.in +++ b/src/chapter10/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -282,7 +285,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/chapter11/Makefile.in b/src/chapter11/Makefile.in index d63c8879..e778720b 100644 --- a/src/chapter11/Makefile.in +++ b/src/chapter11/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -282,7 +285,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/general.ch b/src/general.ch index 9bb6ad76..de65c323 100644 --- a/src/general.ch +++ b/src/general.ch @@ -24,9 +24,9 @@ --> - - - + + + @z diff --git a/src/part3intro/Makefile.in b/src/part3intro/Makefile.in index f1434e9a..ee4d6b18 100644 --- a/src/part3intro/Makefile.in +++ b/src/part3intro/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -281,7 +284,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/prologue/Makefile.in b/src/prologue/Makefile.in index 73f4a7f5..6588f630 100644 --- a/src/prologue/Makefile.in +++ b/src/prologue/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -293,7 +296,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/stylesheets/Makefile.in b/src/stylesheets/Makefile.in index 3c2a737a..ab822e5e 100644 --- a/src/stylesheets/Makefile.in +++ b/src/stylesheets/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,6 +192,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -202,6 +202,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -433,7 +434,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/stylesheets/lfs-xsl/Makefile.in b/src/stylesheets/lfs-xsl/Makefile.in index 761d7422..13856641 100644 --- a/src/stylesheets/lfs-xsl/Makefile.in +++ b/src/stylesheets/lfs-xsl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,6 +192,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -202,6 +202,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -434,7 +435,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/stylesheets/lfs-xsl/pdf/Makefile.in b/src/stylesheets/lfs-xsl/pdf/Makefile.in index ae7c60c9..24b1e0af 100644 --- a/src/stylesheets/lfs-xsl/pdf/Makefile.in +++ b/src/stylesheets/lfs-xsl/pdf/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -278,7 +281,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/stylesheets/lfs-xsl/xhtml/Makefile.in b/src/stylesheets/lfs-xsl/xhtml/Makefile.in index 5cd6dcca..53239081 100644 --- a/src/stylesheets/lfs-xsl/xhtml/Makefile.in +++ b/src/stylesheets/lfs-xsl/xhtml/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -280,7 +283,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/udev-lfs/Makefile.in b/src/udev-lfs/Makefile.in index 2865408b..236742e7 100644 --- a/src/udev-lfs/Makefile.in +++ b/src/udev-lfs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,6 +192,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -202,6 +202,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -425,7 +426,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/udev-lfs/contrib/Makefile.in b/src/udev-lfs/contrib/Makefile.in index 17ea5fdf..09dbc7d6 100644 --- a/src/udev-lfs/contrib/Makefile.in +++ b/src/udev-lfs/contrib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,8 +152,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,6 +192,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -202,6 +202,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -423,7 +424,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/udev-lfs/contrib/debian/Makefile.in b/src/udev-lfs/contrib/debian/Makefile.in index e454feff..74dc3e2b 100644 --- a/src/udev-lfs/contrib/debian/Makefile.in +++ b/src/udev-lfs/contrib/debian/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,6 +134,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CTIE = @CTIE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -142,6 +144,7 @@ DUMPDIR = @DUMPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FOP = @FOP@ INSTALL = @INSTALL@ @@ -271,7 +274,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/version.ac b/version.ac index 1745198c..cf0fdd73 100644 --- a/version.ac +++ b/version.ac @@ -2,5 +2,5 @@ dnl dnl This is part of LFSbookja package. dnl dnl m4-include this file to define the current LFS version -m4_define([lfs_version], [r10.1-196]) -m4_define([lfsd_version], [r10.1-196-systemd]) +m4_define([lfs_version], [r10.1-201]) +m4_define([lfsd_version], [r10.1-201-systemd]) -- 2.11.0