From ca8dc591b84286462c941ebe88b9411cffbffbcc Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 12 Apr 2022 07:28:35 -0700 Subject: Change executable name to egawk and change bug reporting address. * Makefile.am, Makefile.in (bin_PROGRAMS): Change from gawk to egawk. (bin_SCRIPTS): Remove gawkbug; this is not used. (install-exec-hook, uninstall-links): Fix some hard-coded gawk references here. * main.c (usage): Rewrite bug reporting text, specifically discouraging users not to use the bug-awk mailing list for support, unless they reproduce the issue with the original awk. --- Makefile.am | 12 ++++++------ Makefile.in | 16 ++++++++-------- main.c | 13 ++++++------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5e38aac2..9b9db775 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,8 +69,8 @@ endif SUBDIRS += extras doc awklib po test # what to make and install -bin_PROGRAMS = gawk -bin_SCRIPTS = gawkbug +bin_PROGRAMS = egawk +bin_SCRIPTS = include_HEADERS = gawkapi.h BUILT_SOURCES = $(srcdir)/pc/Makefile.tst @@ -150,8 +150,8 @@ RM = rm -f # Use the transform, in case --program-prefix=XXX install-exec-hook: (cd $(DESTDIR)$(bindir); \ - name=`echo gawk | sed '$(transform)'` ; \ - $(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ + name=`echo egawk | sed '$(transform)'` ; \ + $(LN) $${name}$(EXEEXT) egawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ if [ ! -f awk$(EXEEXT) ]; \ then $(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \ fi; exit 0) @@ -159,9 +159,9 @@ install-exec-hook: # Undo the above when uninstalling uninstall-links: (cd $(DESTDIR)$(bindir); \ - name=`echo gawk | sed '$(transform)'` ; \ + name=`echo egawk | sed '$(transform)'` ; \ if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) $${name}$(EXEEXT) > /dev/null; then rm -f awk$(EXEEXT); fi ; \ - rm -f gawk-$(VERSION)$(EXEEXT); exit 0) + rm -f egawk-$(VERSION)$(EXEEXT); exit 0) uninstall-recursive: uninstall-links diff --git a/Makefile.in b/Makefile.in index 5c77b9e8..52574e50 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,7 +117,7 @@ host_triplet = @host@ # ./configure && make check # works properly too. @ENABLE_EXTENSIONS_TRUE@am__append_1 = extension -bin_PROGRAMS = gawk$(EXEEXT) +bin_PROGRAMS = egawk$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ @@ -512,7 +512,7 @@ EXTRA_DIST = \ # Build in awklib after in doc, since we want to extract # sample files if doc/gawk.texi changed. SUBDIRS = support . $(am__append_1) extras doc awklib po test -bin_SCRIPTS = gawkbug +bin_SCRIPTS = include_HEADERS = gawkapi.h BUILT_SOURCES = $(srcdir)/pc/Makefile.tst @@ -676,8 +676,8 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -gawk$(EXEEXT): $(gawk_OBJECTS) $(gawk_DEPENDENCIES) $(EXTRA_gawk_DEPENDENCIES) - @rm -f gawk$(EXEEXT) +egawk$(EXEEXT): $(gawk_OBJECTS) $(gawk_DEPENDENCIES) $(EXTRA_gawk_DEPENDENCIES) + @rm -f egawk$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gawk_OBJECTS) $(gawk_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -1296,8 +1296,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ # Use the transform, in case --program-prefix=XXX install-exec-hook: (cd $(DESTDIR)$(bindir); \ - name=`echo gawk | sed '$(transform)'` ; \ - $(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ + name=`echo egawk | sed '$(transform)'` ; \ + $(LN) $${name}$(EXEEXT) egawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ if [ ! -f awk$(EXEEXT) ]; \ then $(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \ fi; exit 0) @@ -1305,9 +1305,9 @@ install-exec-hook: # Undo the above when uninstalling uninstall-links: (cd $(DESTDIR)$(bindir); \ - name=`echo gawk | sed '$(transform)'` ; \ + name=`echo egawk | sed '$(transform)'` ; \ if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) $${name}$(EXEEXT) > /dev/null; then rm -f awk$(EXEEXT); fi ; \ - rm -f gawk-$(VERSION)$(EXEEXT); exit 0) + rm -f egawk-$(VERSION)$(EXEEXT); exit 0) uninstall-recursive: uninstall-links diff --git a/main.c b/main.c index e044123b..9f38341e 100644 --- a/main.c +++ b/main.c @@ -641,13 +641,12 @@ usage(int exitval, FILE *fp) /* This is one string to make things easier on translators. */ /* TRANSLATORS: --help output (end) no-wrap */ - fputs(_("\nTo report bugs, use the `gawkbug' program.\n\ -For full instructions, see the node `Bugs' in `gawk.info'\n\ -which is section `Reporting Problems and Bugs' in the\n\ -printed version. This same information may be found at\n\ -https://www.gnu.org/software/gawk/manual/html_node/Bugs.html.\n\ -PLEASE do NOT try to report bugs by posting in comp.lang.awk,\n\ -or by using a web forum such as Stack Overflow.\n\n"), fp); + fputs(_("\nTo report bugs in Enhanced Gawk, send e-mail to \n\ +Kaz Kylheku .\n\ +PLEASE do NOT try to report bugs or seek support in the original\n\ +bug-gawk mailing list, unless you can reproduce the issue with the\n\ +unmodified gawk program. Also do not report bugs in the comp.lang.awk\n\ +Usenet newsgroup, or in web forum such as Stack Overflow.\n\n"), fp); /* ditto */ fputs(_("gawk is a pattern scanning and processing language.\n\ -- cgit v1.2.3