Merge branch 'master' into num-handlernum-handler

9 files changed, 288 insertions, 227 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2522ad87..b917e642 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Fix italics in quotations.  Some docbook special
+	cases.
+
 2014-09-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Document that identifiers must use the English
diff --git a/doc/gawk.info b/doc/gawk.info
index 07f283ff..f1aa1f4a 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -19417,10 +19417,10 @@ File: gawk.info,  Node: TCP/IP Networking,  Next: Profiling,  Prev: Two-way I/O,
      unless the host that isn't close
      is busy hung or dead.
 
-   In addition to being able to open a two-way pipeline to a coprocess
-on the same system (*note Two-way I/O::), it is possible to make a
-two-way connection to another process on another system across an IP
-network connection.
+In addition to being able to open a two-way pipeline to a coprocess on
+the same system (*note Two-way I/O::), it is possible to make a two-way
+connection to another process on another system across an IP network
+connection.
 
    You can think of this as just a _very long_ two-way pipeline to a
 coprocess.  The way `gawk' decides that you want to use TCP/IP
@@ -28041,7 +28041,7 @@ B.5 Other Freely Available `awk' Implementations
      `// Do C++ comments work? answer: yes! of course' -- Michael
      Brennan
 
-   There are a number of other freely available `awk' implementations.
+There are a number of other freely available `awk' implementations.
 This minor node briefly describes where to get them:
 
 Unix `awk'
@@ -34437,210 +34437,210 @@ Node: Two-way I/O782092
 Ref: Two-way I/O-Footnote-1787036
 Ref: Two-way I/O-Footnote-2787215
 Node: TCP/IP Networking787297
-Node: Profiling790142
-Node: Advanced Features Summary797693
-Node: Internationalization799557
-Node: I18N and L10N801037
-Node: Explaining gettext801723
-Ref: Explaining gettext-Footnote-1806749
-Ref: Explaining gettext-Footnote-2806933
-Node: Programmer i18n807098
-Ref: Programmer i18n-Footnote-1811892
-Node: Translator i18n811941
-Node: String Extraction812735
-Ref: String Extraction-Footnote-1813868
-Node: Printf Ordering813954
-Ref: Printf Ordering-Footnote-1816736
-Node: I18N Portability816800
-Ref: I18N Portability-Footnote-1819249
-Node: I18N Example819312
-Ref: I18N Example-Footnote-1822018
-Node: Gawk I18N822090
-Node: I18N Summary822728
-Node: Debugger824067
-Node: Debugging825089
-Node: Debugging Concepts825530
-Node: Debugging Terms827386
-Node: Awk Debugging829983
-Node: Sample Debugging Session830875
-Node: Debugger Invocation831395
-Node: Finding The Bug832731
-Node: List of Debugger Commands839210
-Node: Breakpoint Control840542
-Node: Debugger Execution Control844206
-Node: Viewing And Changing Data847566
-Node: Execution Stack850924
-Node: Debugger Info852437
-Node: Miscellaneous Debugger Commands856431
-Node: Readline Support861615
-Node: Limitations862507
-Node: Debugging Summary864780
-Node: Arbitrary Precision Arithmetic865948
-Node: Computer Arithmetic867435
-Ref: Computer Arithmetic-Footnote-1871822
-Node: Math Definitions871879
-Ref: table-ieee-formats875168
-Ref: Math Definitions-Footnote-1875708
-Node: MPFR features875811
-Node: FP Math Caution877428
-Ref: FP Math Caution-Footnote-1878478
-Node: Inexactness of computations878847
-Node: Inexact representation879795
-Node: Comparing FP Values881150
-Node: Errors accumulate882114
-Node: Getting Accuracy883547
-Node: Try To Round886206
-Node: Setting precision887105
-Ref: table-predefined-precision-strings887787
-Node: Setting the rounding mode889580
-Ref: table-gawk-rounding-modes889944
-Ref: Setting the rounding mode-Footnote-1893398
-Node: Arbitrary Precision Integers893577
-Ref: Arbitrary Precision Integers-Footnote-1897350
-Node: POSIX Floating Point Problems897499
-Ref: POSIX Floating Point Problems-Footnote-1901375
-Node: Floating point summary901413
-Node: Dynamic Extensions903617
-Node: Extension Intro905169
-Node: Plugin License906434
-Node: Extension Mechanism Outline907119
-Ref: figure-load-extension907543
-Ref: figure-load-new-function909028
-Ref: figure-call-new-function910030
-Node: Extension API Description912014
-Node: Extension API Functions Introduction913464
-Node: General Data Types918331
-Ref: General Data Types-Footnote-1924024
-Node: Requesting Values924323
-Ref: table-value-types-returned925060
-Node: Memory Allocation Functions926018
-Ref: Memory Allocation Functions-Footnote-1928765
-Node: Constructor Functions928861
-Node: Registration Functions930619
-Node: Extension Functions931304
-Node: Exit Callback Functions933606
-Node: Extension Version String934854
-Node: Input Parsers935504
-Node: Output Wrappers945318
-Node: Two-way processors949834
-Node: Printing Messages952038
-Ref: Printing Messages-Footnote-1953115
-Node: Updating `ERRNO'953267
-Node: Accessing Parameters954006
-Node: Symbol Table Access955236
-Node: Symbol table by name955750
-Node: Symbol table by cookie957726
-Ref: Symbol table by cookie-Footnote-1961859
-Node: Cached values961922
-Ref: Cached values-Footnote-1965426
-Node: Array Manipulation965517
-Ref: Array Manipulation-Footnote-1966615
-Node: Array Data Types966654
-Ref: Array Data Types-Footnote-1969357
-Node: Array Functions969449
-Node: Flattening Arrays973323
-Node: Creating Arrays980175
-Node: Extension API Variables984906
-Node: Extension Versioning985542
-Node: Extension API Informational Variables987443
-Node: Extension API Boilerplate988529
-Node: Finding Extensions992333
-Node: Extension Example992893
-Node: Internal File Description993623
-Node: Internal File Ops997714
-Ref: Internal File Ops-Footnote-11009146
-Node: Using Internal File Ops1009286
-Ref: Using Internal File Ops-Footnote-11011633
-Node: Extension Samples1011901
-Node: Extension Sample File Functions1013425
-Node: Extension Sample Fnmatch1020993
-Node: Extension Sample Fork1022475
-Node: Extension Sample Inplace1023688
-Node: Extension Sample Ord1025363
-Node: Extension Sample Readdir1026199
-Ref: table-readdir-file-types1027055
-Node: Extension Sample Revout1027854
-Node: Extension Sample Rev2way1028445
-Node: Extension Sample Read write array1029186
-Node: Extension Sample Readfile1031065
-Node: Extension Sample API Tests1032165
-Node: Extension Sample Time1032690
-Node: gawkextlib1034005
-Node: Extension summary1036818
-Node: Extension Exercises1040511
-Node: Language History1041233
-Node: V7/SVR3.11042876
-Node: SVR41045196
-Node: POSIX1046638
-Node: BTL1048024
-Node: POSIX/GNU1048758
-Node: Feature History1054534
-Node: Common Extensions1067625
-Node: Ranges and Locales1068937
-Ref: Ranges and Locales-Footnote-11073554
-Ref: Ranges and Locales-Footnote-21073581
-Ref: Ranges and Locales-Footnote-31073815
-Node: Contributors1074036
-Node: History summary1079461
-Node: Installation1080830
-Node: Gawk Distribution1081781
-Node: Getting1082265
-Node: Extracting1083089
-Node: Distribution contents1084731
-Node: Unix Installation1090501
-Node: Quick Installation1091118
-Node: Additional Configuration Options1093560
-Node: Configuration Philosophy1095298
-Node: Non-Unix Installation1097649
-Node: PC Installation1098107
-Node: PC Binary Installation1099418
-Node: PC Compiling1101266
-Ref: PC Compiling-Footnote-11104265
-Node: PC Testing1104370
-Node: PC Using1105546
-Node: Cygwin1109698
-Node: MSYS1110507
-Node: VMS Installation1111021
-Node: VMS Compilation1111817
-Ref: VMS Compilation-Footnote-11113039
-Node: VMS Dynamic Extensions1113097
-Node: VMS Installation Details1114470
-Node: VMS Running1116722
-Node: VMS GNV1119556
-Node: VMS Old Gawk1120279
-Node: Bugs1120749
-Node: Other Versions1124753
-Node: Installation summary1130980
-Node: Notes1132036
-Node: Compatibility Mode1132901
-Node: Additions1133683
-Node: Accessing The Source1134608
-Node: Adding Code1136044
-Node: New Ports1142222
-Node: Derived Files1146703
-Ref: Derived Files-Footnote-11152178
-Ref: Derived Files-Footnote-21152212
-Ref: Derived Files-Footnote-31152808
-Node: Future Extensions1152922
-Node: Implementation Limitations1153528
-Node: Extension Design1154776
-Node: Old Extension Problems1155930
-Ref: Old Extension Problems-Footnote-11157447
-Node: Extension New Mechanism Goals1157504
-Ref: Extension New Mechanism Goals-Footnote-11160864
-Node: Extension Other Design Decisions1161053
-Node: Extension Future Growth1163159
-Node: Old Extension Mechanism1163995
-Node: Notes summary1165757
-Node: Basic Concepts1166943
-Node: Basic High Level1167624
-Ref: figure-general-flow1167896
-Ref: figure-process-flow1168495
-Ref: Basic High Level-Footnote-11171724
-Node: Basic Data Typing1171909
-Node: Glossary1175237
-Node: Copying1200389
-Node: GNU Free Documentation License1237945
-Node: Index1263081
+Node: Profiling790139
+Node: Advanced Features Summary797690
+Node: Internationalization799554
+Node: I18N and L10N801034
+Node: Explaining gettext801720
+Ref: Explaining gettext-Footnote-1806746
+Ref: Explaining gettext-Footnote-2806930
+Node: Programmer i18n807095
+Ref: Programmer i18n-Footnote-1811889
+Node: Translator i18n811938
+Node: String Extraction812732
+Ref: String Extraction-Footnote-1813865
+Node: Printf Ordering813951
+Ref: Printf Ordering-Footnote-1816733
+Node: I18N Portability816797
+Ref: I18N Portability-Footnote-1819246
+Node: I18N Example819309
+Ref: I18N Example-Footnote-1822015
+Node: Gawk I18N822087
+Node: I18N Summary822725
+Node: Debugger824064
+Node: Debugging825086
+Node: Debugging Concepts825527
+Node: Debugging Terms827383
+Node: Awk Debugging829980
+Node: Sample Debugging Session830872
+Node: Debugger Invocation831392
+Node: Finding The Bug832728
+Node: List of Debugger Commands839207
+Node: Breakpoint Control840539
+Node: Debugger Execution Control844203
+Node: Viewing And Changing Data847563
+Node: Execution Stack850921
+Node: Debugger Info852434
+Node: Miscellaneous Debugger Commands856428
+Node: Readline Support861612
+Node: Limitations862504
+Node: Debugging Summary864777
+Node: Arbitrary Precision Arithmetic865945
+Node: Computer Arithmetic867432
+Ref: Computer Arithmetic-Footnote-1871819
+Node: Math Definitions871876
+Ref: table-ieee-formats875165
+Ref: Math Definitions-Footnote-1875705
+Node: MPFR features875808
+Node: FP Math Caution877425
+Ref: FP Math Caution-Footnote-1878475
+Node: Inexactness of computations878844
+Node: Inexact representation879792
+Node: Comparing FP Values881147
+Node: Errors accumulate882111
+Node: Getting Accuracy883544
+Node: Try To Round886203
+Node: Setting precision887102
+Ref: table-predefined-precision-strings887784
+Node: Setting the rounding mode889577
+Ref: table-gawk-rounding-modes889941
+Ref: Setting the rounding mode-Footnote-1893395
+Node: Arbitrary Precision Integers893574
+Ref: Arbitrary Precision Integers-Footnote-1897347
+Node: POSIX Floating Point Problems897496
+Ref: POSIX Floating Point Problems-Footnote-1901372
+Node: Floating point summary901410
+Node: Dynamic Extensions903614
+Node: Extension Intro905166
+Node: Plugin License906431
+Node: Extension Mechanism Outline907116
+Ref: figure-load-extension907540
+Ref: figure-load-new-function909025
+Ref: figure-call-new-function910027
+Node: Extension API Description912011
+Node: Extension API Functions Introduction913461
+Node: General Data Types918328
+Ref: General Data Types-Footnote-1924021
+Node: Requesting Values924320
+Ref: table-value-types-returned925057
+Node: Memory Allocation Functions926015
+Ref: Memory Allocation Functions-Footnote-1928762
+Node: Constructor Functions928858
+Node: Registration Functions930616
+Node: Extension Functions931301
+Node: Exit Callback Functions933603
+Node: Extension Version String934851
+Node: Input Parsers935501
+Node: Output Wrappers945315
+Node: Two-way processors949831
+Node: Printing Messages952035
+Ref: Printing Messages-Footnote-1953112
+Node: Updating `ERRNO'953264
+Node: Accessing Parameters954003
+Node: Symbol Table Access955233
+Node: Symbol table by name955747
+Node: Symbol table by cookie957723
+Ref: Symbol table by cookie-Footnote-1961856
+Node: Cached values961919
+Ref: Cached values-Footnote-1965423
+Node: Array Manipulation965514
+Ref: Array Manipulation-Footnote-1966612
+Node: Array Data Types966651
+Ref: Array Data Types-Footnote-1969354
+Node: Array Functions969446
+Node: Flattening Arrays973320
+Node: Creating Arrays980172
+Node: Extension API Variables984903
+Node: Extension Versioning985539
+Node: Extension API Informational Variables987440
+Node: Extension API Boilerplate988526
+Node: Finding Extensions992330
+Node: Extension Example992890
+Node: Internal File Description993620
+Node: Internal File Ops997711
+Ref: Internal File Ops-Footnote-11009143
+Node: Using Internal File Ops1009283
+Ref: Using Internal File Ops-Footnote-11011630
+Node: Extension Samples1011898
+Node: Extension Sample File Functions1013422
+Node: Extension Sample Fnmatch1020990
+Node: Extension Sample Fork1022472
+Node: Extension Sample Inplace1023685
+Node: Extension Sample Ord1025360
+Node: Extension Sample Readdir1026196
+Ref: table-readdir-file-types1027052
+Node: Extension Sample Revout1027851
+Node: Extension Sample Rev2way1028442
+Node: Extension Sample Read write array1029183
+Node: Extension Sample Readfile1031062
+Node: Extension Sample API Tests1032162
+Node: Extension Sample Time1032687
+Node: gawkextlib1034002
+Node: Extension summary1036815
+Node: Extension Exercises1040508
+Node: Language History1041230
+Node: V7/SVR3.11042873
+Node: SVR41045193
+Node: POSIX1046635
+Node: BTL1048021
+Node: POSIX/GNU1048755
+Node: Feature History1054531
+Node: Common Extensions1067622
+Node: Ranges and Locales1068934
+Ref: Ranges and Locales-Footnote-11073551
+Ref: Ranges and Locales-Footnote-21073578
+Ref: Ranges and Locales-Footnote-31073812
+Node: Contributors1074033
+Node: History summary1079458
+Node: Installation1080827
+Node: Gawk Distribution1081778
+Node: Getting1082262
+Node: Extracting1083086
+Node: Distribution contents1084728
+Node: Unix Installation1090498
+Node: Quick Installation1091115
+Node: Additional Configuration Options1093557
+Node: Configuration Philosophy1095295
+Node: Non-Unix Installation1097646
+Node: PC Installation1098104
+Node: PC Binary Installation1099415
+Node: PC Compiling1101263
+Ref: PC Compiling-Footnote-11104262
+Node: PC Testing1104367
+Node: PC Using1105543
+Node: Cygwin1109695
+Node: MSYS1110504
+Node: VMS Installation1111018
+Node: VMS Compilation1111814
+Ref: VMS Compilation-Footnote-11113036
+Node: VMS Dynamic Extensions1113094
+Node: VMS Installation Details1114467
+Node: VMS Running1116719
+Node: VMS GNV1119553
+Node: VMS Old Gawk1120276
+Node: Bugs1120746
+Node: Other Versions1124750
+Node: Installation summary1130974
+Node: Notes1132030
+Node: Compatibility Mode1132895
+Node: Additions1133677
+Node: Accessing The Source1134602
+Node: Adding Code1136038
+Node: New Ports1142216
+Node: Derived Files1146697
+Ref: Derived Files-Footnote-11152172
+Ref: Derived Files-Footnote-21152206
+Ref: Derived Files-Footnote-31152802
+Node: Future Extensions1152916
+Node: Implementation Limitations1153522
+Node: Extension Design1154770
+Node: Old Extension Problems1155924
+Ref: Old Extension Problems-Footnote-11157441
+Node: Extension New Mechanism Goals1157498
+Ref: Extension New Mechanism Goals-Footnote-11160858
+Node: Extension Other Design Decisions1161047
+Node: Extension Future Growth1163153
+Node: Old Extension Mechanism1163989
+Node: Notes summary1165751
+Node: Basic Concepts1166937
+Node: Basic High Level1167618
+Ref: figure-general-flow1167890
+Ref: figure-process-flow1168489
+Ref: Basic High Level-Footnote-11171718
+Node: Basic Data Typing1171903
+Node: Glossary1175231
+Node: Copying1200383
+Node: GNU Free Documentation License1237939
+Node: Index1263075
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 148032aa..17972c7a 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -19169,8 +19169,8 @@ them, i.e., to tell @command{awk} what they should do.
 @subsection Function Definition Syntax
 
 @quotation
-It's entirely fair to say that the @command{awk} syntax for local
-variable definitions is appallingly awful.
+@i{It's entirely fair to say that the @command{awk} syntax for local
+variable definitions is appallingly awful.}
 @author Brian Kernighan
 @end quotation
 
@@ -27279,6 +27279,7 @@ using regular pipes.
 @cindex @code{/inet6/@dots{}} special files (@command{gawk})
 @cindex files, @code{/inet6/@dots{}} (@command{gawk})
 @cindex @code{EMISTERED}
+@ifnotdocbook
 @quotation
 @code{EMISTERED}:@*
 @ @ @ @ @i{A host is a host from coast to coast,@*
@@ -27286,6 +27287,17 @@ using regular pipes.
 @ @ @ @ unless the host that isn't close@*
 @ @ @ @ is busy hung or dead.}
 @end quotation
+@end ifnotdocbook
+
+@docbook
+<blockquote>
+<literallayout class="normal"><literal>EMISTERED</literal>:
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>A host is a host from coast to coast,</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>and no-one can talk to host that's close,</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>unless the host that isn't close</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy hung or dead.</emphasis></literallayout>
+</blockquote>
+@end docbook
 
 In addition to being able to open a two-way pipeline to a coprocess
 on the same system
@@ -30217,7 +30229,7 @@ to follow.
 @section Floating Point Arithmetic: Caveat Emptor!
 
 @quotation
-Math class is tough!
+@i{Math class is tough!}
 @author Teen Talk Barbie, July 1992
 @end quotation
 
@@ -38019,11 +38031,24 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 
 @end ignore
 @cindex Brennan, Michael
+@ifnotdocbook
 @quotation
 @i{It's kind of fun to put comments like this in your awk code.}@*
 @ @ @ @ @ @ @code{// Do C++ comments work? answer: yes! of course}
 @author Michael Brennan
 @end quotation
+@end ifnotdocbook
+
+@docbook
+<blockquote><attribution>Michael Brennan</attribution>
+<literallayout>
+<emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal>
+</literallayout>
+</blockquote>
+@end docbook
+
+
 
 There are a number of other freely available @command{awk} implementations.
 This @value{SECTION} briefly describes where to get them:
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index daa4695c..004157f0 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -18296,8 +18296,8 @@ them, i.e., to tell @command{awk} what they should do.
 @subsection Function Definition Syntax
 
 @quotation
-It's entirely fair to say that the @command{awk} syntax for local
-variable definitions is appallingly awful.
+@i{It's entirely fair to say that the @command{awk} syntax for local
+variable definitions is appallingly awful.}
 @author Brian Kernighan
 @end quotation
 
@@ -26377,6 +26377,7 @@ using regular pipes.
 @cindex @code{/inet6/@dots{}} special files (@command{gawk})
 @cindex files, @code{/inet6/@dots{}} (@command{gawk})
 @cindex @code{EMISTERED}
+@ifnotdocbook
 @quotation
 @code{EMISTERED}:@*
 @ @ @ @ @i{A host is a host from coast to coast,@*
@@ -26384,6 +26385,17 @@ using regular pipes.
 @ @ @ @ unless the host that isn't close@*
 @ @ @ @ is busy hung or dead.}
 @end quotation
+@end ifnotdocbook
+
+@docbook
+<blockquote>
+<literallayout class="normal"><literal>EMISTERED</literal>:
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>A host is a host from coast to coast,</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>and no-one can talk to host that's close,</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>unless the host that isn't close</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;<emphasis>is busy hung or dead.</emphasis></literallayout>
+</blockquote>
+@end docbook
 
 In addition to being able to open a two-way pipeline to a coprocess
 on the same system
@@ -29315,7 +29327,7 @@ to follow.
 @section Floating Point Arithmetic: Caveat Emptor!
 
 @quotation
-Math class is tough!
+@i{Math class is tough!}
 @author Teen Talk Barbie, July 1992
 @end quotation
 
@@ -37117,11 +37129,24 @@ Date: Wed, 4 Sep 1996 08:11:48 -0700 (PDT)
 
 @end ignore
 @cindex Brennan, Michael
+@ifnotdocbook
 @quotation
 @i{It's kind of fun to put comments like this in your awk code.}@*
 @ @ @ @ @ @ @code{// Do C++ comments work? answer: yes! of course}
 @author Michael Brennan
 @end quotation
+@end ifnotdocbook
+
+@docbook
+<blockquote><attribution>Michael Brennan</attribution>
+<literallayout>
+<emphasis>It's kind of fun to put comments like this in your awk code.</emphasis>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<literal>// Do C++ comments work? answer: yes! of course</literal>
+</literallayout>
+</blockquote>
+@end docbook
+
+
 
 There are a number of other freely available @command{awk} implementations.
 This @value{SECTION} briefly describes where to get them:
diff --git a/test/ChangeLog b/test/ChangeLog
index 68cc18e6..8e89f0d2 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-18         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* filefuncs.awk: Change to build directory instead of "..".
+	* Makefile.am (filefuncs): Pass in $(abs_top_builddir).
+
 2014-09-05         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* functab4.awk: Changed to use stat instead of chdir since
diff --git a/test/Makefile.am b/test/Makefile.am
index 3be8b7cb..1c14ea81 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1972,6 +1972,12 @@ printhuge::
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+filefuncs:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index b9753369..b7e25511 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2394,6 +2394,11 @@ printhuge::
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+filefuncs:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -3707,11 +3712,6 @@ fnmatch:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-filefuncs:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 fork:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 5c34af9e..f8d5e8a9 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1311,11 +1311,6 @@ fnmatch:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-filefuncs:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 fork:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/filefuncs.awk b/test/filefuncs.awk
index 4bbfcb55..7aa5ae6a 100644
--- a/test/filefuncs.awk
+++ b/test/filefuncs.awk
@@ -1,7 +1,7 @@
 @load "filefuncs"
 
 BEGIN {
-   if (chdir("..") < 0) {
+   if (chdir(builddir) < 0) {
       printf "Error: chdir failed with ERRNO %s\n", ERRNO
       exit 1
    }