[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5013-g7dc2bd5f
From: |
Arnold Robbins |
Subject: |
[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5013-g7dc2bd5f |
Date: |
Thu, 9 Mar 2023 12:58:51 -0500 (EST) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-5.2-stable has been updated
via 7dc2bd5f4e112faa509f13ff64fb86ec6606f9d4 (commit)
via 361cfd7aabd59f2ebc9bc69492f65f1189e120ca (commit)
via aa05baede714a9041df6bbb4b26c4c63b8a9bdc5 (commit)
via 0aa59175c6c80128f6b6ee85cced91eda158f97f (commit)
from 6a11ea7447e82c887ef4d50bac1ebdd1fbba7b23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7dc2bd5f4e112faa509f13ff64fb86ec6606f9d4
commit 7dc2bd5f4e112faa509f13ff64fb86ec6606f9d4
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Thu Mar 9 19:58:11 2023 +0200
Updates to gawk workflow doc.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7316a0cf..7ede4870 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkworkflow.texi (UPDATE-MONTH, EDITION): Updated.
+ Copyright, add current year.
+ (Submitting Your Changes): Add a note about diffs for generated
+ files also being in the output of `git diff'. Thanks to Manual
+ Collado for the suggestion.
+ (New feature development): Fix the text of a command.
+
2023-03-09 Manuel Collado <mcollado2011@gmail.com>
* gawktexi.in, gawkinet.texi, *.{png,jpg,eps,pdf,txt,fig}: rename
diff --git a/doc/gawkworkflow.info b/doc/gawkworkflow.info
index 2596ec61..591ca0d6 100644
--- a/doc/gawkworkflow.info
+++ b/doc/gawkworkflow.info
@@ -1,10 +1,11 @@
This is gawkworkflow.info, produced by makeinfo version 7.0.1 from
gawkworkflow.texi.
-Copyright © 2017, 2018, 2019, 2020, 2022 Free Software Foundation, Inc.
+Copyright © 2017, 2018, 2019, 2020, 2022, 2023 Free Software Foundation,
+Inc.
- This is Edition 0.74 of âParticipating in âgawkâ Developmentâ.
+ This is Edition 0.75 of âParticipating in âgawkâ Developmentâ.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -35,11 +36,11 @@ General Introduction
This file describes how to participate in software development for GNU
Awk (âgawkâ) (http://www.gnu.org/software/gawk).
- Copyright © 2017, 2018, 2019, 2020, 2022 Free Software Foundation,
-Inc.
+ Copyright © 2017, 2018, 2019, 2020, 2022, 2023 Free Software
+Foundation, Inc.
- This is Edition 0.74 of âParticipating in âgawkâ Developmentâ.
+ This is Edition 0.75 of âParticipating in âgawkâ Developmentâ.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -1005,6 +1006,11 @@ _Generate a single large patch_
Mail the âpython.diffâ file to the appropriate mailing list along
with a description of what youâve changed and why.
+ The patch file will likely contain changes to generated files, such
+ as âawkgram.câ or âMakefile.inâ. If you are comfortable manually
+ editing the patch file to remove those changes, do so. If not,
+ then send the file as-is and the maintainer will handle it.
+
_Generate a set of patches that in toto comprise your changes_
To do this, use âgit format-patchâ:
@@ -1164,7 +1170,8 @@ without commit access:
3. If necessary, update the documentation: âdoc/gawktexi.inâ and/or
âdoc/gawk.1â.
- 4. Use âgit diff > mychange.diffâ to create a patch file.
+ 4. Use âgit diff > mychange.diffâ to create a patch file. (If you
+ want, remove the diffs for generated files.)
5. Send it to the mailing list for discussion.
@@ -1281,7 +1288,7 @@ Savannah repo.
otherwise, you should _always_ start branches for new features from
âmasterâ, and not from the current âstableâ branch.
- Use âcheckout -b feature/FEATURE_NAMEâ to create the initial
+ Use âgit checkout -b feature/FEATURE_NAMEâ to create the initial
branch. You may then elect to keep it purely local, or to push it
up to Savannah for review, even if the feature is not yet totally
âready for prime time.â
@@ -1827,7 +1834,7 @@ Index
* gawktexi.in documentation: Developing patches. (line 13)
* GCC, the GNU Compiler Collection: Compilers. (line 6)
* generating a single patch: Submitting Changes. (line 14)
-* generating multiple patches: Submitting Changes. (line 24)
+* generating multiple patches: Submitting Changes. (line 29)
* gettext: GNU Tools. (line 27)
* git branch command, -a option: Remotes. (line 6)
* git command, git branch: Repo Copies. (line 39)
@@ -1868,8 +1875,8 @@ Index
* git command, git pull <2>: Rebasing. (line 10)
* git command, git checkout <5>: Submitting Changes. (line 18)
* git command, git diff <1>: Submitting Changes. (line 18)
-* git command, git format-patch: Submitting Changes. (line 24)
-* git command, git checkout <6>: Submitting Changes. (line 27)
+* git command, git format-patch: Submitting Changes. (line 29)
+* git command, git checkout <6>: Submitting Changes. (line 32)
* git command, git checkout <7>: Removing Branches. (line 9)
* git command, git pull <3>: Removing Branches. (line 9)
* git command, git branch <1>: Removing Branches. (line 9)
@@ -1883,10 +1890,10 @@ Index
* git command, git merge: Points to remember. (line 37)
* git command, git clone <2>: ssh clone. (line 10)
* git command, git diff <3>: Developing patches. (line 16)
-* git command, git diff <4>: Developing patches. (line 26)
-* git command, git add <1>: Developing patches. (line 26)
-* git command, git commit <1>: Developing patches. (line 26)
-* git command, git push <1>: Developing patches. (line 26)
+* git command, git diff <4>: Developing patches. (line 27)
+* git command, git add <1>: Developing patches. (line 27)
+* git command, git commit <1>: Developing patches. (line 27)
+* git command, git push <1>: Developing patches. (line 27)
* git command, git checkout <11>: Developing new features.
(line 9)
* git command, git pull <6>: Developing new features.
@@ -1960,7 +1967,7 @@ Index
* ownership of directories: General practices. (line 17)
* pager.status configuration setting: Configuring git. (line 24)
* patch, single, generation of: Submitting Changes. (line 14)
-* patches, multiple, generation of: Submitting Changes. (line 24)
+* patches, multiple, generation of: Submitting Changes. (line 29)
* pcc compiler: Compilers. (line 40)
* pcc compiler, Git mirror: Compilers. (line 50)
* Portable C compiler: Compilers. (line 40)
@@ -1994,69 +2001,69 @@ Index
Tag Table:
-Node: Top1162
-Node: Preface5303
-Node: Intended Audience5874
-Node: This Manual6756
-Node: Conventions8317
-Node: Acknowledgments9838
-Node: Reviewers10275
-Node: Contributing10596
-Node: Using Git14050
-Node: Push Pull14810
-Node: Repo Copies16376
-Ref: savannah-repo17391
-Ref: your-repo18448
-Ref: Repo Copies-Footnote-120167
-Node: Local Branches20224
-Ref: your-repo-222045
-Ref: Local Branches-Footnote-123131
-Node: Branches are state23189
-Node: Repo State23924
-Node: Local State26108
-Node: Remotes26776
-Node: Configuring git28133
-Ref: Configuring git-Footnote-130543
-Node: Development without commit access30714
-Node: Cloning31774
-Ref: Cloning-Footnote-133339
-Node: Switching Branches33406
-Node: Starting A New Branch34040
-Ref: Starting A New Branch-Footnote-136024
-Ref: Starting A New Branch-Footnote-236084
-Node: Undoing a change36166
-Node: Saving Without Committing36790
-Node: Updating38374
-Node: Rebasing38889
-Node: Merge Conflicts39511
-Node: Submitting Changes41788
-Ref: Submitting Changes-Footnote-143972
-Ref: Submitting Changes-Footnote-244011
-Ref: Submitting Changes-Footnote-344047
-Node: Removing Branches44095
-Node: Points to remember44631
-Node: Development with commit access46340
-Node: Initial setup46993
-Node: ssh clone47797
-Node: Developing patches48387
-Node: Developing new features49752
-Node: Developing fixes51664
-Node: General practices52755
-Node: Repo Maintenance57584
-Ref: Repo Maintenance-Footnote-160495
-Node: Development Stuff60631
-Node: Coding style61200
-Ref: Coding style-Footnote-161862
-Node: Doing paperwork61956
-Node: Tools62755
-Node: GNU Tools63345
-Node: Compilers65578
-Ref: Compilers-Footnote-168258
-Node: Debugging68296
-Node: Cheat Sheet69107
-Node: Resources73214
-Node: TODO73799
-Node: Index74021
+Node: Top1168
+Node: Preface5315
+Node: Intended Audience5886
+Node: This Manual6768
+Node: Conventions8329
+Node: Acknowledgments9850
+Node: Reviewers10287
+Node: Contributing10608
+Node: Using Git14062
+Node: Push Pull14822
+Node: Repo Copies16388
+Ref: savannah-repo17403
+Ref: your-repo18460
+Ref: Repo Copies-Footnote-120179
+Node: Local Branches20236
+Ref: your-repo-222057
+Ref: Local Branches-Footnote-123143
+Node: Branches are state23201
+Node: Repo State23936
+Node: Local State26120
+Node: Remotes26788
+Node: Configuring git28145
+Ref: Configuring git-Footnote-130555
+Node: Development without commit access30726
+Node: Cloning31786
+Ref: Cloning-Footnote-133351
+Node: Switching Branches33418
+Node: Starting A New Branch34052
+Ref: Starting A New Branch-Footnote-136036
+Ref: Starting A New Branch-Footnote-236096
+Node: Undoing a change36178
+Node: Saving Without Committing36802
+Node: Updating38386
+Node: Rebasing38901
+Node: Merge Conflicts39523
+Node: Submitting Changes41800
+Ref: Submitting Changes-Footnote-144271
+Ref: Submitting Changes-Footnote-244310
+Ref: Submitting Changes-Footnote-344346
+Node: Removing Branches44394
+Node: Points to remember44930
+Node: Development with commit access46639
+Node: Initial setup47292
+Node: ssh clone48096
+Node: Developing patches48686
+Node: Developing new features50110
+Node: Developing fixes52022
+Node: General practices53113
+Node: Repo Maintenance57946
+Ref: Repo Maintenance-Footnote-160857
+Node: Development Stuff60993
+Node: Coding style61562
+Ref: Coding style-Footnote-162224
+Node: Doing paperwork62318
+Node: Tools63117
+Node: GNU Tools63707
+Node: Compilers65940
+Ref: Compilers-Footnote-168620
+Node: Debugging68658
+Node: Cheat Sheet69469
+Node: Resources73576
+Node: TODO74161
+Node: Index74383
End Tag Table
diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi
index d455c6d5..2afbb664 100644
--- a/doc/gawkworkflow.texi
+++ b/doc/gawkworkflow.texi
@@ -28,10 +28,10 @@
@c applies to and all the info about who's publishing this edition
@c These apply across the board.
-@set UPDATE-MONTH July, 2022
+@set UPDATE-MONTH March, 2023
@set TITLE Participating in @command{gawk} Development
-@set EDITION 0.74
+@set EDITION 0.75
@iftex
@set DOCUMENT booklet
@@ -144,13 +144,13 @@ Fax: +1-617-542-2652
Email: <email>gnu@@gnu.org</email>
URL: <ulink
url="http://www.gnu.org">http://www.gnu.org/</ulink></literallayout>
-<literallayout class="normal">Copyright © 2017, 2018, 2019, 2020, 2022
+<literallayout class="normal">Copyright © 2017, 2018, 2019, 2020, 2022,
2023
Free Software Foundation, Inc.
All Rights Reserved.</literallayout>
@end docbook
@ifnotdocbook
-Copyright @copyright{} 2017, 2018, 2019, 2020, 2022
+Copyright @copyright{} 2017, 2018, 2019, 2020, 2022, 2023
Free Software Foundation, Inc.
@end ifnotdocbook
@sp 2
@@ -1301,6 +1301,12 @@ $ @kbd{git diff master > /tmp/python.diff}
Mail the @file{python.diff} file to the appropriate mailing list
along with a description of what you've changed and why.
+The patch file will likely contain changes to generated files,
+such as @file{awkgram.c} or @file{Makefile.in}. If you are
+comfortable manually editing the patch file to remove those
+changes, do so. If not, then send the file as-is and the
+maintainer will handle it.
+
@cindex @command{git} command @subentry @code{git format-patch}
@cindex generating multiple patches
@cindex patches, multiple, generation of
@@ -1493,6 +1499,7 @@ and/or @file{doc/gawk.1}.
@cindex @command{git} command @subentry @code{git diff}
@item
Use @samp{git diff > mychange.diff} to create a patch file.
+(If you want, remove the diffs for generated files.)
@item
Send it to the mailing list for discussion.
@@ -1644,7 +1651,7 @@ Unless you can convince the maintainer (and the other
developers!) otherwise,
you should @emph{always} start branches for new features from @code{master},
and not from the current ``stable'' branch.
-Use @samp{checkout -b feature/@var{feature_name}} to create the initial branch.
+Use @samp{git checkout -b feature/@var{feature_name}} to create the initial
branch.
You may then elect to keep it purely local, or to push it up to Savannah for
review, even if the feature is not yet totally ``ready for prime time.''
@end table
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=361cfd7aabd59f2ebc9bc69492f65f1189e120ca
commit 361cfd7aabd59f2ebc9bc69492f65f1189e120ca
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Thu Mar 9 19:47:53 2023 +0200
Doc fix.
diff --git a/ChangeLog b/ChangeLog
index 422aaa80..c1d22b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* gawkapi.h: Update copyright year. Small edit in leading comment.
+ Unrelated:
+
+ * NEWS: Updated. Update copyright year.
+
2023-03-07 Arnold D. Robbins <arnold@skeeve.com>
* awkgram.y (optimize_assignment): Turn Op_store_field_exp
diff --git a/NEWS b/NEWS
index ca2ac451..ab6d0425 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
- Copyright (C) 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+ Copyright (C) 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -31,7 +31,11 @@ Changes from 5.2.1 to 5.2.2
decide whether or not to take control of a file. In particular, the
readdir extension is simplified for Windows because of this.
-8. As usual, there have been several minor code cleanups and bug fixes.
+8. The various PNG files are now installed for Info and HTML. The
+ images files now have gawk_ prefixed names to avoid any conflicts
+ with other installed PNG file names.
+
+9. As usual, there have been several minor code cleanups and bug fixes.
See the ChangeLog for details.
Changes from 5.2.0 to 5.2.1
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=aa05baede714a9041df6bbb4b26c4c63b8a9bdc5
commit aa05baede714a9041df6bbb4b26c4c63b8a9bdc5
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Thu Mar 9 19:47:30 2023 +0200
Small update in gawkapi.h.
diff --git a/ChangeLog b/ChangeLog
index 84d8d0c9..422aaa80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-03-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkapi.h: Update copyright year. Small edit in leading comment.
+
2023-03-07 Arnold D. Robbins <arnold@skeeve.com>
* awkgram.y (optimize_assignment): Turn Op_store_field_exp
diff --git a/gawkapi.h b/gawkapi.h
index 8b743c2a..3047c753 100644
--- a/gawkapi.h
+++ b/gawkapi.h
@@ -3,7 +3,7 @@
*/
/*
- * Copyright (C) 2012-2019, 2021, 2022, the Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019, 2021, 2022, 2023, the Free Software Foundation,
Inc.
*
* This file is part of GAWK, the GNU implementation of the
* AWK Programming Language.
@@ -99,7 +99,7 @@
* a good idea to always do this. This restriction may be relaxed
* in a subsequent revision of the API.
*
- * NOTE: While each routine in the API has a few lines of summary for it
+ * 3. While each routine in the API has a few lines of summary for it
* in this header, said summaries are not standalone, adequate documentation.
You
* should read the chapter in the gawk manual on writing extensions. Find it
online
* at
https://www.gnu.org/software/gawk/manual/html_node/Dynamic-Extensions.html,
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=0aa59175c6c80128f6b6ee85cced91eda158f97f
commit 0aa59175c6c80128f6b6ee85cced91eda158f97f
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Thu Mar 9 19:44:07 2023 +0200
Install png file for Info and HTML. Give image files gawk_* names.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 699d1f37..7316a0cf 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-09 Manuel Collado <mcollado2011@gmail.com>
+
+ * gawktexi.in, gawkinet.texi, *.{png,jpg,eps,pdf,txt,fig}: rename
+ image file names to ensure a gawk_ prefix (except *flashlight*).
+ * Makefile.am: Ditto. And install image files for .info and .html
+ docs.
+
2023-03-02 Arnold D. Robbins <arnold@skeeve.com>
* gawktexi.in (Input Parsers): Clarify and improve some of the
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8cb061f7..ba04c8c8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,27 +29,24 @@ info_TEXINFOS = gawk.texi gawkinet.texi gawkworkflow.texi
pm-gawk.texi
man_MANS = gawk.1 gawkbug.1 pm-gawk.1
+png_images = gawk_api-figure1.png gawk_api-figure2.png gawk_api-figure3.png \
+ gawk_array-elements.png gawk_general-program.png gawk_process-flow.png
+html_images = $(png_images) gawk_statist.jpg
+
+fig_images = $(png_images:%.png=%.fig)
+txt_images = $(png_images:%.png=%.txt) statist.txt
+eps_images = $(txt_images:%.txt=%.eps)
+pdf_images = $(txt_images:%.txt=%.pdf)
+
EXTRA_DIST = ChangeLog ChangeLog.0 ChangeLog.1 \
README.card ad.block setter.outline \
awkcard.in awkforai.txt texinfo.tex cardfonts \
- api-figure1.eps api-figure1.fig api-figure1.pdf \
- api-figure1.png api-figure1.txt \
- api-figure2.eps api-figure2.fig api-figure2.pdf \
- api-figure2.png api-figure2.txt \
- api-figure3.eps api-figure3.fig api-figure3.pdf \
- api-figure3.png api-figure3.txt \
- array-elements.eps array-elements.fig array-elements.pdf \
- array-elements.png array-elements.txt \
+ $(fig_images) $(txt_images) $(eps_images) $(pdf_images) \
gawktexi.in sidebar.awk \
- general-program.eps general-program.fig general-program.pdf \
- general-program.png general-program.txt \
it \
- process-flow.eps process-flow.fig process-flow.pdf \
- process-flow.png process-flow.txt \
macros colors no.colors $(man_MANS) \
lflashlight-small.xpic lflashlight.eps lflashlight.pdf \
rflashlight-small.xpic rflashlight.eps rflashlight.pdf \
- statist.jpg statist.eps statist.pdf statist.txt \
wordlist wordlist2 wordlist3 wordlist4 wordlist5 wordlist6 \
bc_notes
@@ -159,3 +156,30 @@ spellinet:
@echo ==== gawkinet.texi ====
export LC_ALL=C ; spell "$(srcdir)"/gawkinet.texi | \
sort -u | comm -23 - "$(srcdir)"/wordlist4
+
+# Install/unistall graphic image files in the info/ dir
+
+imagedir = $(infodir)
+image_DATA = $(html_images)
+
+# Install/unistall graphic image files in the html doc dir
+
+install-html-local:
+ @$(NORMAL_INSTALL)
+ @list='$(html_images)'; test -n "$(htmldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ $(INSTALL_DATA) $$p "$(DESTDIR)$(htmldir)" || exit $$?; \
+ done;
+
+uninstall-local:
+ @$(NORMAL_UNINSTALL)
+ @list='$(html_images)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$p'"; \
+ rm -rf "$(DESTDIR)$(htmldir)/$$p"; \
+ done
+
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 29a9abb2..c0b51a08 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -38,6 +38,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA
#
+
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -196,7 +197,8 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(imagedir)"
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -227,6 +229,7 @@ am__uninstall_files_from_dir = { \
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
+DATA = $(image_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/build-aux/texinfo.tex ChangeLog texinfo.tex
@@ -368,27 +371,23 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
info_TEXINFOS = gawk.texi gawkinet.texi gawkworkflow.texi pm-gawk.texi
man_MANS = gawk.1 gawkbug.1 pm-gawk.1
+png_images = gawk_api-figure1.png gawk_api-figure2.png gawk_api-figure3.png \
+ gawk_array-elements.png gawk_general-program.png gawk_process-flow.png
+
+html_images = $(png_images) gawk_statist.jpg
+fig_images = $(png_images:%.png=%.fig)
+txt_images = $(png_images:%.png=%.txt) statist.txt
+eps_images = $(txt_images:%.txt=%.eps)
+pdf_images = $(txt_images:%.txt=%.pdf)
EXTRA_DIST = ChangeLog ChangeLog.0 ChangeLog.1 \
README.card ad.block setter.outline \
awkcard.in awkforai.txt texinfo.tex cardfonts \
- api-figure1.eps api-figure1.fig api-figure1.pdf \
- api-figure1.png api-figure1.txt \
- api-figure2.eps api-figure2.fig api-figure2.pdf \
- api-figure2.png api-figure2.txt \
- api-figure3.eps api-figure3.fig api-figure3.pdf \
- api-figure3.png api-figure3.txt \
- array-elements.eps array-elements.fig array-elements.pdf \
- array-elements.png array-elements.txt \
+ $(fig_images) $(txt_images) $(eps_images) $(pdf_images) \
gawktexi.in sidebar.awk \
- general-program.eps general-program.fig general-program.pdf \
- general-program.png general-program.txt \
it \
- process-flow.eps process-flow.fig process-flow.pdf \
- process-flow.png process-flow.txt \
macros colors no.colors $(man_MANS) \
lflashlight-small.xpic lflashlight.eps lflashlight.pdf \
rflashlight-small.xpic rflashlight.eps rflashlight.pdf \
- statist.jpg statist.eps statist.pdf statist.txt \
wordlist wordlist2 wordlist3 wordlist4 wordlist5 wordlist6 \
bc_notes
@@ -407,6 +406,10 @@ PAPEROPTS = -dpaper=letter -P-pletter
# Use this if your troff can correctly handle macros from 'colors' file
AWKCARD = awkcard.ps
+
+# Install/unistall graphic image files in the info/ dir
+imagedir = $(infodir)
+image_DATA = $(html_images)
all: all-am
.SUFFIXES:
@@ -643,6 +646,27 @@ uninstall-man1:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-imageDATA: $(image_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(imagedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(imagedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagedir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(imagedir)" || exit $$?; \
+ done
+
+uninstall-imageDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(imagedir)'; $(am__uninstall_files_from_dir)
tags TAGS:
ctags CTAGS:
@@ -687,9 +711,9 @@ distdir-am: $(DISTFILES)
dist-info
check-am: all-am
check: check-am
-all-am: Makefile $(INFO_DEPS) $(MANS)
+all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
+ for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
"$(DESTDIR)$(imagedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -743,7 +767,7 @@ info: info-am
info-am: $(INFO_DEPS)
-install-data-am: install-info-am install-man
+install-data-am: install-imageDATA install-info-am install-man
install-dvi: install-dvi-am
@@ -766,7 +790,7 @@ install-exec-am:
install-html: install-html-am
-install-html-am: $(HTMLS)
+install-html-am: $(HTMLS) install-html-local
@$(NORMAL_INSTALL)
@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
if test -n "$$list"; then \
@@ -879,8 +903,9 @@ ps: ps-am
ps-am: $(PSS)
-uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
- uninstall-man uninstall-pdf-am uninstall-ps-am
+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-imageDATA \
+ uninstall-info-am uninstall-local uninstall-man \
+ uninstall-pdf-am uninstall-ps-am
uninstall-man: uninstall-man1
@@ -891,15 +916,16 @@ uninstall-man: uninstall-man1
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-aminfo \
+ install-html-am install-html-local install-imageDATA \
+ install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic mostlyclean mostlyclean-aminfo \
mostlyclean-generic pdf pdf-am pdf-local ps ps-am tags-am \
uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
- uninstall-info-am uninstall-man uninstall-man1 \
- uninstall-pdf-am uninstall-ps-am
+ uninstall-imageDATA uninstall-info-am uninstall-local \
+ uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
.PRECIOUS: Makefile
@@ -993,6 +1019,27 @@ spellinet:
export LC_ALL=C ; spell "$(srcdir)"/gawkinet.texi | \
sort -u | comm -23 - "$(srcdir)"/wordlist4
+# Install/unistall graphic image files in the html doc dir
+
+install-html-local:
+ @$(NORMAL_INSTALL)
+ @list='$(html_images)'; test -n "$(htmldir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ $(INSTALL_DATA) $$p "$(DESTDIR)$(htmldir)" || exit $$?; \
+ done;
+
+uninstall-local:
+ @$(NORMAL_UNINSTALL)
+ @list='$(html_images)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
+ echo " rm -rf '$(DESTDIR)$(htmldir)/$$p'"; \
+ rm -rf "$(DESTDIR)$(htmldir)/$$p"; \
+ done
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/doc/gawk.info b/doc/gawk.info
index c7e72bb8..9a8c59e1 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -11932,7 +11932,7 @@ figure-array-elements, conceptually, if the element
values are eight,
â"foo"â, â""â, and 30.
- [image src="array-elements.png" alt="A Contiguous Array"
text="+---------+---------+--------+---------+
+ [image src="gawk_array-elements.png" alt="A Contiguous Array"
text="+---------+---------+--------+---------+
| 8 | \"foo\" | \"\" | 30 | Value
+---------+---------+--------+---------+
0 1 2 3 Index"