From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id E87123858D20; Thu, 27 Jan 2022 02:46:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E87123858D20 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: fix info+man page builds X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 73d515fcfecd1004ccffef8fcd0c7223b9eec6ab X-Git-Newrev: 866de704f3b5b8f8d297b1adf5e4c5fc62b93c16 Message-Id: <20220127024624.E87123858D20@sourceware.org> Date: Thu, 27 Jan 2022 02:46:24 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2022 02:46:25 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D866de704f3b= 5b8f8d297b1adf5e4c5fc62b93c16 commit 866de704f3b5b8f8d297b1adf5e4c5fc62b93c16 Author: Mike Frysinger Date: Wed Jan 26 21:41:47 2022 -0500 newlib: fix info+man page builds =20 The work to merge libc/machine/ up a dir lost the stub doc targets. So when libc/ recursed into machine/, it would stop going deeper as the doc rules were empty. But now that libc/ goes directly into the libc/machine/$arch/ and those have never had doc stubs, the build fails. Add a quick hack to the top dir to ignore all machine/$arch/ dirs when generating docs. A follow up series will delete all of this code as it merges all the doc rules into the top newlib dir. Diff: --- newlib/libc/Makefile.am | 4 ++-- newlib/libc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 7807291ba..5151e00da 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -199,7 +199,7 @@ stmp-targetdep: force rm -f tmp-targetdep.texi targetdoc=3D`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ + if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) TARGETDOC=3D$${targetdoc} doc) || exit 1; \ fi; \ done @@ -218,7 +218,7 @@ libc_TEXINFOS =3D sigset.texi posix.texi stdio64.texi i= convset.texi \ =20 docbook-recursive: force for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ + if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) docbook) || exit 1; \ fi; \ done diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index 7e29c18e1..27d014496 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -1185,7 +1185,7 @@ stmp-targetdep: force rm -f tmp-targetdep.texi targetdoc=3D`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ + if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) TARGETDOC=3D$${targetdoc} doc) || exit 1; \ fi; \ done @@ -1199,7 +1199,7 @@ $(SUBDEFS): stmp-targetdep ; @true =20 docbook-recursive: force for d in $(SUBDIRS); do \ - if test "$$d" !=3D "."; then \ + if test "$$d" !=3D "." && test "$$d" !=3D "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) docbook) || exit 1; \ fi; \ done