From patchwork Sat Dec 31 13:57:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 37866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3352972wrt; Sat, 31 Dec 2022 05:58:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsD2vr6ylbnUJtPaW/sy1noGx2wPuhuu61oXnGk9tNNZQipY7Ei5dlR75xmd3ftQCVXwRhd X-Received: by 2002:a17:906:30ca:b0:7c1:6091:e73 with SMTP id b10-20020a17090630ca00b007c160910e73mr31733346ejb.1.1672495087755; Sat, 31 Dec 2022 05:58:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672495087; cv=none; d=google.com; s=arc-20160816; b=XQp8ac4i5U4UvMwxBdDRH4OOg7VUZV/2Mn15WsomF/ElRQ+6PWLMmOoN1gnmb4oJjS MlT7qHmt6+jKknZ2Fq41AnWVEnY5ekbLIDY0QpbAA7fSzD6qFyZc1ILIVxO8CoZrtn+b yfwK56C9hGVmAHKXVTI+U2hoTY2W7G2b1u1k6Cqmmn//TJrspnEuQQyRyga4O3yqfnBc mLqMVkmLyToy5+rSi9U5K1TC3O6t/CEkt/vtjMcCArBMyrM9uI6sKPY+8M/aj72d6kXh ZEsmBGsdRNzZxZ1tUxDV6H1XAUVkBjD7/tg61mhyFU4wZNZHDinkG3KmEa6kGYmTuUv2 ROlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :delivered-to:dkim-signature:dkim-filter; bh=UYFdmsgEqJSdAKZJVmGAlxUr+rAgbYuMF0mNoZtdoik=; b=fMPtA91Q6p0NG460F3Cz7UT1FX4JMsx+tBCZ4gdKCu2GSEJjzsA/VfhXVlZ+xRMHIm OPHHOIv7CROTIPP/aYiOdisDHYKfqdxVO/0cASpydX4WO3Vbywn13a+EU5xUKaep9D2r ZM9eG+miHGaLFC2/ftp7Kisay3TxnfeuB0Ywmd5qmvIQtA/lxHidyLy2mRoysUwV1HPA RwK19uCUAsXJPcG6yZuQCU/XqIRJ61qsT6uUmS5+e/PldYDxxvR5uBJuYq2fAoF01Lcl PyeN71TRHgba/LD8yPnM9FCZPPN+nEibIFshg22yyOB23ADoziSwWeAqrj+mzEhX5qf6 P1WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=RcEDWkso; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id sh33-20020a1709076ea100b0080a15fe49bcsi20738423ejc.569.2022.12.31.05.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 05:58:07 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=RcEDWkso; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8500C3858425 for ; Sat, 31 Dec 2022 13:58:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8500C3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1672495086; bh=UYFdmsgEqJSdAKZJVmGAlxUr+rAgbYuMF0mNoZtdoik=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=RcEDWksoGu8ontFlV4q+Dhyg6/fomukXjcB3WveUGA/XiA9OmPNmjXGwC3ucPTGcT KbTsJTQcqpb/jDWYgrtRHDaCXb9sNJU9Wd/CF33g3zh5NmstGFlLQOU2Bys7w/aotO NwLjuzAGZieQvnjmnnVYK3sktaPmsM4Er8+0yr2U= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 799B93858D1E for ; Sat, 31 Dec 2022 13:57:24 +0000 (GMT) Received: by mail-wr1-x42a.google.com with SMTP id z16so5986919wrw.1 for ; Sat, 31 Dec 2022 05:57:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=UYFdmsgEqJSdAKZJVmGAlxUr+rAgbYuMF0mNoZtdoik=; b=vh7tAdYbxPD5x5WqME4in2ieX0AgaFFIVQaNFLlvaHqtzPsNUYDdgynA4hDaLIVtDx +VMAj3c38w3qKu4hVI8hNbne82V1usQiModi6Ts5Shnv51eXhU37gsfU1ETPHXb4FvKW e9c8u+WspfgzM5pEDz2ej0ycWckqJu4YCY8gyYOUtC3yp8k0R+vsCvZCeNEdhXQ9uVUz l1t6MwbIyKEIDaIoDIvkyDopH1m2Gsh3jUlDt6iADVfZetX75H4JfIQXBsKcBap6Rfka NJ0PAIyyJAcK4EbZQI9rgOoe1u0h+us7kTuvpYPl7zlUdiAPrX4KyefIVWZIjmRuFI77 08XQ== X-Gm-Message-State: AFqh2krY+2tfOIu2HgWO59iU1Wkkzzza7yAA0ITDJ7zSQ8bKtw0M5JW5 PdCtAD1Vhg4lHqPHF2tiK+yAyVo4RkA= X-Received: by 2002:a5d:61cd:0:b0:276:d6ba:4b91 with SMTP id q13-20020a5d61cd000000b00276d6ba4b91mr16293754wrv.47.1672495043057; Sat, 31 Dec 2022 05:57:23 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id b7-20020a5d40c7000000b00241cfe6e286sm23338904wrq.98.2022.12.31.05.57.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 31 Dec 2022 05:57:22 -0800 (PST) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [PATCH] modula-2, doc: Build dvi, ps and pdf doc in the gcc/doc directory. Date: Sat, 31 Dec 2022 13:57:21 +0000 Message-Id: <20221231135721.10758-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe , gaiusmod2@gmail.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753738209132059743?= X-GMAIL-MSGID: =?utf-8?q?1753738209132059743?= Tested on darwin21 with "make m2.pdf" and "make m2.dvi". OK for trunk? thanks. Iain --- 8< --- This also uses the configured $(TEXI2DVI) and $(TEXI2PDF) to deal with those targets (since we cannot assume to know what the user might have installed). gcc/m2/ChangeLog: * Make-lang.in (dvi, ps, pdf): Build in the gcc/doc directory, also use the configured tools for texi -> dvi and texi -> pdf. --- gcc/m2/Make-lang.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index a134d3aca92..6c2b095bb7d 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -140,18 +140,22 @@ $(DESTDIR)$(man1dir)/$(GM2_INSTALL_NAME)$(man1ext): doc/m2.1 installdirs -$(INSTALL_DATA) $< $@ -chmod a-x $@ -m2.dvi: $(TEXISRC) +m2.dvi: doc/m2.dvi + +doc/m2.dvi: $(TEXISRC) $(TEXI2DVI) -I $(objdir)/m2 -I $(srcdir)/doc/include $(srcdir)/doc/gm2.texi -o $@ -m2.ps: m2.dvi +doc/m2.ps: doc/m2.dvi dvips -o $@ $< -m2.pdf: m2.ps - gs -q -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$@ $< +m2.pdf: doc/m2.pdf + +doc/m2.pdf: $(TEXISRC) + $(TEXI2PDF) -I $(objdir)/m2 -I $(srcdir)/doc/include $(srcdir)/doc/gm2.texi -o $@ .INTERMEDIATE: m2.pod -m2.pod: doc/gm2.texi $(TEXISRC) +m2.pod: $(TEXISRC) -$(TEXI2POD) -I $(objdir)/m2 -D m2 < $< > $@ doc/m2.info: $(TEXISRC)