cobol/119302 - transform gcobol.3 name during install, install as gcobol-io.3

Message ID 20250415170955.3B2DF137A5@imap1.dmz-prg2.suse.org
State Committed
Commit 248e228fecdfb68833481eff8c3c0c7aa9703a8d
Headers
Series cobol/119302 - transform gcobol.3 name during install, install as gcobol-io.3 |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-arm-bootstrap fail Patch failed to apply

Commit Message

Richard Biener April 15, 2025, 5:09 p.m. UTC
  The following installs gcobol.3 as gcobol-io.3 and applies
program-transform-name to the gcobol-io part.  This follows
naming of the pdf and the html variants.
It also uses $(man1ext) and $(man3ext) consistently.

Built and installed on x86_64-unknown-linux-gnu.

OK?

Thanks,
Richard.

	PR cobol/119302
gcc/cobol/
	* Make-lang.in (GCOBOLIO_INSTALL_NAME): Define.
	Use $(GCOBOLIO_INSTALL_NAME) for gcobol.3 manpage source
	upon install.
---
 gcc/cobol/Make-lang.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
  

Comments

Robert Dubner April 15, 2025, 5:16 p.m. UTC | #1
> -----Original Message-----
> From: Richard Biener <rguenther@suse.de>
> Sent: Tuesday, April 15, 2025 13:10
> To: gcc-patches@gcc.gnu.org
> Cc: Jakub Jelinek <jakub@redhat.com>; rdubner@symas.com
> Subject: [PATCH] cobol/119302 - transform gcobol.3 name during install,
> install as gcobol-io.3
> 
> The following installs gcobol.3 as gcobol-io.3 and applies
> program-transform-name to the gcobol-io part.  This follows
> naming of the pdf and the html variants.
> It also uses $(man1ext) and $(man3ext) consistently.
> 
> Built and installed on x86_64-unknown-linux-gnu.
> 
> OK?

Okay.

> 
> Thanks,
> Richard.
> 
> 	PR cobol/119302
> gcc/cobol/
> 	* Make-lang.in (GCOBOLIO_INSTALL_NAME): Define.
> 	Use $(GCOBOLIO_INSTALL_NAME) for gcobol.3 manpage source
> 	upon install.
> ---
>  gcc/cobol/Make-lang.in | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/gcc/cobol/Make-lang.in b/gcc/cobol/Make-lang.in
> index 422ebe28b21..9b74dd39b57 100644
> --- a/gcc/cobol/Make-lang.in
> +++ b/gcc/cobol/Make-lang.in
> @@ -35,6 +35,7 @@
>  # - define the names for selecting the language in LANGUAGES.
> 
>  GCOBOL_INSTALL_NAME := $(shell echo gcobol|sed
> '$(program_transform_name)')
> +GCOBOLIO_INSTALL_NAME := $(shell echo gcobol-io|sed
> '$(program_transform_name)')
>  GCOBOL_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo
> gcobol|sed '$(program_transform_name)')
> 
>  GCOBC_INSTALL_NAME := $(shell echo gcobc|sed
'$(program_transform_name)')
> @@ -293,7 +294,7 @@ cobol.install-common: installdirs
> 
>  cobol.install-man: installdirs
>  	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.1
> $(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME)$(man1ext)
> -	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.3 $(DESTDIR)$(man3dir)/
> +	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.3
> $(DESTDIR)$(man3dir)/$(GCOBOLIO_INSTALL_NAME)$(man3ext)
> 
>  cobol.install-info:
> 
> @@ -342,8 +343,8 @@ cobol.uninstall:
>  	rm -rf 	$(DESTDIR)$(bindir)/$(GCOBOL_INSTALL_NAME)$(exeext)	\
>  		$(DESTDIR)$(bindir)/$(GCOBC_INSTALL_NAME)		\
>  		$(DESTDIR)$(datadir)/gcobol/				\
> -		$(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME).1		\
> -		$(DESTDIR)$(man3dir)/gcobol.3
> +		$(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME)$(man1ext)	\
> +		$(DESTDIR)$(man3dir)/$(GCOBOLIO_INSTALL_NAME)$(man3ext)
> 
>  cobol.man:
>  cobol.srcman:
> --
> 2.43.0
  

Patch

diff --git a/gcc/cobol/Make-lang.in b/gcc/cobol/Make-lang.in
index 422ebe28b21..9b74dd39b57 100644
--- a/gcc/cobol/Make-lang.in
+++ b/gcc/cobol/Make-lang.in
@@ -35,6 +35,7 @@ 
 # - define the names for selecting the language in LANGUAGES.
 
 GCOBOL_INSTALL_NAME := $(shell echo gcobol|sed '$(program_transform_name)')
+GCOBOLIO_INSTALL_NAME := $(shell echo gcobol-io|sed '$(program_transform_name)')
 GCOBOL_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcobol|sed '$(program_transform_name)')
 
 GCOBC_INSTALL_NAME := $(shell echo gcobc|sed '$(program_transform_name)')
@@ -293,7 +294,7 @@  cobol.install-common: installdirs
 
 cobol.install-man: installdirs
 	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.1 $(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME)$(man1ext)
-	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.3 $(DESTDIR)$(man3dir)/
+	$(INSTALL_DATA) $(srcdir)/cobol/gcobol.3 $(DESTDIR)$(man3dir)/$(GCOBOLIO_INSTALL_NAME)$(man3ext)
 
 cobol.install-info:
 
@@ -342,8 +343,8 @@  cobol.uninstall:
 	rm -rf 	$(DESTDIR)$(bindir)/$(GCOBOL_INSTALL_NAME)$(exeext)	\
 		$(DESTDIR)$(bindir)/$(GCOBC_INSTALL_NAME)		\
 		$(DESTDIR)$(datadir)/gcobol/				\
-		$(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME).1		\
-		$(DESTDIR)$(man3dir)/gcobol.3
+		$(DESTDIR)$(man1dir)/$(GCOBOL_INSTALL_NAME)$(man1ext)	\
+		$(DESTDIR)$(man3dir)/$(GCOBOLIO_INSTALL_NAME)$(man3ext)
 
 cobol.man:
 cobol.srcman: