From nobody Wed Nov 19 03:41:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763120000; cv=none; d=zohomail.com; s=zohoarc; b=h8LO+n/rwXFyhz8UJTQfdls1WzOFAw5xCugeXLw3oBUJnzSgrPL8FqCA9kfljZwHGx90EM5lSRc9TUlMS8R9DwlDbghLtrQwGZ7ByTgLduqTnENRst5VGmLDV8PF+aJlBawA8CPALBsdnU5kTEVofjqGx1x09DCNzyKGZ3MJfT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763120000; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ULa01XMBOk0XUwU3HICTxucNohNobFgTxHDIYuvUKbA=; b=dWcWL3T3MixT3aQ+R0IiK8NJ6bUzlzFr/k6A0dFpQlYPhlFNy8uwUUzq1iW6UjnII5KXCa+7RCLRXVFOryk2dVJW0mvbqQSPIaxa4dV7pcrHROf6X3mBZVYeFKyZzZ7C5z4y4Rl5e4wmod2g/qhRj+1rCWQCBR0ZnitHn2vRlvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 176312000052613.72131494525297; Fri, 14 Nov 2025 03:33:20 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1162448.1490103 (Exim 4.92) (envelope-from ) id 1vJs2x-0001zy-7b; Fri, 14 Nov 2025 11:32:55 +0000 Received: by outflank-mailman (output) from mailman id 1162448.1490103; Fri, 14 Nov 2025 11:32:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJs2x-0001zr-4h; Fri, 14 Nov 2025 11:32:55 +0000 Received: by outflank-mailman (input) for mailman id 1162448; Fri, 14 Nov 2025 11:32:53 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJs2v-0001jd-Sl for xen-devel@lists.xenproject.org; Fri, 14 Nov 2025 11:32:53 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a86a21ee-c14d-11f0-9d18-b5c5bf9af7f9; Fri, 14 Nov 2025 12:32:53 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id ACB8D1F74A; Fri, 14 Nov 2025 11:32:52 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 892703EA61; Fri, 14 Nov 2025 11:32:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 5m4SIGQTF2nMSwAAD6G6ig (envelope-from ); Fri, 14 Nov 2025 11:32:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a86a21ee-c14d-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763119972; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ULa01XMBOk0XUwU3HICTxucNohNobFgTxHDIYuvUKbA=; b=MKTEGOsMpXreL52gNLWhpzq0jTNC4vdCZOdVXzO2LOEkTEpVXEYrPcJ+4yEKaQC8hbcLev lds6WazYycnUjWVxI0+5g8KLzJ5wNXjs7+ppxAsLC04dgjDLFVmegMrglUwVd5v/BYVwqF 7aTOnBo49CGSvoXkZNhGkrqdvYVgqnw= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1763119972; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ULa01XMBOk0XUwU3HICTxucNohNobFgTxHDIYuvUKbA=; b=MKTEGOsMpXreL52gNLWhpzq0jTNC4vdCZOdVXzO2LOEkTEpVXEYrPcJ+4yEKaQC8hbcLev lds6WazYycnUjWVxI0+5g8KLzJ5wNXjs7+ppxAsLC04dgjDLFVmegMrglUwVd5v/BYVwqF 7aTOnBo49CGSvoXkZNhGkrqdvYVgqnw= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Anthony PERARD Subject: [PATCH v2 2/4] docs: replace @xxx@ markers at build time Date: Fri, 14 Nov 2025 12:32:36 +0100 Message-ID: <20251114113238.9279-3-jgross@suse.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251114113238.9279-1-jgross@suse.com> References: <20251114113238.9279-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_THREE(0.00)[3]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -6.80 X-Spam-Level: X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763120001486158500 Content-Type: text/plain; charset="utf-8" Use the apply-build-vars make macro to replace the @xxx@ markers in *.in files only at build time. This allows to change the affected document files without having to run "configure" for making the change effective. While at it add the generated files to the distclean make target. Signed-off-by: Juergen Gross --- V2: - don't rename source files --- docs/Makefile | 8 +++++++- docs/configure | 7 +------ docs/configure.ac | 9 +-------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 37776d303c..e5f4a8ca86 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,8 +8,11 @@ DATE :=3D $(call date,"+%Y-%m-%d") DOC_ARCHES :=3D arm ppc riscv x86_32 x86_64 MAN_SECTIONS :=3D 1 5 7 8 =20 +IN_FILES :=3D man/xl-disk-configuration.5.pod man/xl-network-configuration= .5.pod +IN_FILES +=3D man/xl.1.pod man/xl.cfg.5.pod man/xl.conf.5.pod + # Documentation sources to build -MAN-SRC-y :=3D $(sort $(basename $(wildcard man/*.pod man/*.pandoc))) +MAN-SRC-y :=3D $(sort $(basename $(wildcard man/*.pod man/*.pandoc) $(IN_F= ILES))) =20 RST-SRC-y :=3D $(sort $(filter-out %index.rst,$(shell find * -type f -name= '*.rst' -print))) =20 @@ -77,11 +80,14 @@ clean: clean-man-pages distclean: clean rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \ autom4te.cache + rm -f $(IN_FILES) =20 # Top level install targets =20 .PHONY: man-pages install-man-pages clean-man-pages uninstall-man-pages =20 +$(foreach file,$(IN_FILES),$(eval $(call apply-build-vars,$(file)))) + # Metarules for generating manpages. Run with $(1) substitued for section define GENERATE_MANPAGE_RULES =20 diff --git a/docs/configure b/docs/configure index 98dda3cd0f..8871914dcb 100755 --- a/docs/configure +++ b/docs/configure @@ -1794,7 +1794,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu =20 =20 =20 -ac_config_files=3D"$ac_config_files ../config/Docs.mk man/xl.cfg.5.pod man= /xl.1.pod man/xl-disk-configuration.5.pod man/xl-network-configuration.5.po= d man/xl.conf.5.pod" +ac_config_files=3D"$ac_config_files ../config/Docs.mk" =20 =20 =20 @@ -3063,11 +3063,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Docs.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Docs.mk" = ;; - "man/xl.cfg.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.cfg.5.pod" ;; - "man/xl.1.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.1.pod" ;; - "man/xl-disk-configuration.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/x= l-disk-configuration.5.pod" ;; - "man/xl-network-configuration.5.pod") CONFIG_FILES=3D"$CONFIG_FILES ma= n/xl-network-configuration.5.pod" ;; - "man/xl.conf.5.pod") CONFIG_FILES=3D"$CONFIG_FILES man/xl.conf.5.pod" = ;; =20 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/docs/configure.ac b/docs/configure.ac index c2e5edd3b3..43dc516056 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -5,14 +5,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh ../xen/M= akefile]), [xen-devel@lists.xen.org], [xen], [https://www.xen.org/]) AC_CONFIG_SRCDIR([misc/xen-command-line.pandoc]) -AC_CONFIG_FILES([ -../config/Docs.mk -man/xl.cfg.5.pod -man/xl.1.pod -man/xl-disk-configuration.5.pod -man/xl-network-configuration.5.pod -man/xl.conf.5.pod -]) +AC_CONFIG_FILES([../config/Docs.mk]) AC_CONFIG_AUX_DIR([../]) =20 # M4 Macro includes --=20 2.51.0