From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DDD073858022 for ; Sun, 13 Nov 2022 21:10:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DDD073858022 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668373840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZMC3sn5Gyduk1OSJFpeXxRBP1/468zelhdPa3plyXM=; b=NrAB+6u/MWxCyVB78XEbEorDTEgKPPAThKSw0rIwuArSQgheiE1HA5hPmh5EAh/yCpRcfZ LDHjFUJhXrOT/WpOcifhfC13XNGnBq1dL9Z66SIPNT9TW2j5+ticLn2N5687Agu32kqoLx fcHBBtoKG7oSunMVD1lKvDjg+O4KqzI= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-588-QlyBXMXSMEGkTDXeXjTiLA-1; Sun, 13 Nov 2022 16:10:39 -0500 X-MC-Unique: QlyBXMXSMEGkTDXeXjTiLA-1 Received: by mail-ed1-f70.google.com with SMTP id f17-20020a056402355100b00466481256f6so6942839edd.19 for ; Sun, 13 Nov 2022 13:10:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:subject:from:cc:content-language:to :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=sZMC3sn5Gyduk1OSJFpeXxRBP1/468zelhdPa3plyXM=; b=L+My/nTTmOVQcgf1LMrhU+x3Dbky2ghD/9qtuNpIQWh/FwIxvmrK9B4Xyx0FiSZI+v xOHAUn8qiwWg1wpmDXxUEK4ydqKP8ZpPh2xiWxuIPinlBIESOqZG0aunWElNTZiBGIUm Zm+gnv6ZY3xKKmGyqOKdW8fFPjnc5095dUEtObY5NYQZ5JcabAIzAP8fWhrxi44izlTE D4XFAL6ICpl7lGd+skjxnetTivQWXgeL0n3M2IqskD5SrX2L8YNcJ3Wl4Nhxi9bGynmw 4h78yrU6Eg0OFbjT9Ek8VxktJfA8uBVUsDZIqqvqKNkikoZy1VhJEH69Q78tDi/cq5Za yjVQ== X-Gm-Message-State: ANoB5plfUWzFgSUVBHAeO2qzOBt7JAO2m3YoZEFzV/mbj4vta0lxRL4g UFQBNYmIvO0/O6NvOz4CM9KQCkg1YzImfsbozTktWW4aQGhG/Cd9uduf1/3ftWX0F9hbqrSz3+B c4iHlRwUa91UEGyzYM68Z/7medXjKpDx0qtyzlb88x65TB3VYdWKDKZc4HeBc3/ILgYOHtg== X-Received: by 2002:aa7:c155:0:b0:461:8cf7:4783 with SMTP id r21-20020aa7c155000000b004618cf74783mr9244236edp.385.1668373836181; Sun, 13 Nov 2022 13:10:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf5y6ar2n7oCHdu1cgPsM4lKfWjy6kXvl0Ou5fUZR+nD2PfpZ4W6/1B0tEop2jcgxddqRq3Upw== X-Received: by 2002:aa7:c155:0:b0:461:8cf7:4783 with SMTP id r21-20020aa7c155000000b004618cf74783mr9244229edp.385.1668373835939; Sun, 13 Nov 2022 13:10:35 -0800 (PST) Received: from [192.168.178.30] (i59F6C4A8.versanet.de. [89.246.196.168]) by smtp.gmail.com with ESMTPSA id d13-20020a1709064c4d00b007aa239cf4d9sm3355636ejw.89.2022.11.13.13.10.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Nov 2022 13:10:35 -0800 (PST) Message-ID: Date: Sun, 13 Nov 2022 22:10:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 To: gcc-patches@gcc.gnu.org Cc: =?UTF-8?Q?Martin_Li=c5=a1ka?= From: Stephan Bergmann Subject: [PATCH] sphinx: more build fixing if sphinx-build is missing X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: ...similar to 1f9c79367e136e0ca5b775562e6111e1a0d0046f "sphinx: fix building if sphinx-build is missing" gcc/ChangeLog: * fortran/Make-lang.in: Build info pages conditionally. --- gcc/fortran/Make-lang.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 48acbed1754..852b6f3327f 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -161,7 +161,9 @@ fortran.install-pdf: $(F95_PDFFILES) F95_MANFILES = doc/gfortran/man/man/gfortran.1 doc/gfortran/man/man/gfortran.1: $(SPHINX_FILES) - + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/gfortran/man SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/gfortran/man SPHINXBUILD=$(SPHINX_BUILD) \ + else true; fi fortran.man: $(F95_MANFILES) -- 2.38.1