diff options
-rw-r--r-- | maintMakefile | 2 | ||||
-rw-r--r-- | src/file.c | 2 | ||||
-rw-r--r-- | src/misc.c | 2 | ||||
-rw-r--r-- | src/remake.c | 2 | ||||
-rw-r--r-- | src/vmsjobs.c | 2 | ||||
-rw-r--r-- | src/w32/pathstuff.c | 2 | ||||
-rwxr-xr-x | tests/run_make_tests.com | 2 | ||||
-rw-r--r-- | tests/scripts/features/implicit_search | 4 | ||||
-rw-r--r-- | tests/scripts/features/output-sync | 2 | ||||
-rw-r--r-- | tests/scripts/features/patternrules | 2 | ||||
-rw-r--r-- | tests/scripts/features/se_explicit | 2 | ||||
-rw-r--r-- | tests/scripts/features/statipattrules | 4 | ||||
-rw-r--r-- | tests/scripts/functions/foreach | 2 | ||||
-rw-r--r-- | tests/scripts/variables/MAKEFLAGS | 4 | ||||
-rw-r--r-- | tests/test_driver.pl | 2 |
15 files changed, 18 insertions, 18 deletions
diff --git a/maintMakefile b/maintMakefile index b9f822ad..869bfdb0 100644 --- a/maintMakefile +++ b/maintMakefile @@ -531,7 +531,7 @@ $(UPLOADS): $(DIST_ARCHIVES) $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE) $(FTPPUT) "$(gnu-upload-host)" "$(gnu-upload-dir)/$(@:upload-%=%)" $^ -# Rebuild Makefile.in if this file is modifed. +# Rebuild Makefile.in if this file is modified. Makefile.in: maintMakefile # Copyright (C) 1997-2022 Free Software Foundation, Inc. @@ -807,7 +807,7 @@ snap_deps (void) else no_intermediates = 1; - /* The same file connot be both .INTERMEDIATE and .NOTINTERMEDIATE. + /* The same file cannot be both .INTERMEDIATE and .NOTINTERMEDIATE. However, it is possible for a file to be .INTERMEDIATE and also match a .NOTINTERMEDIATE pattern. In that case, the intermediate file has priority over the notintermediate pattern. This priority is enforced by @@ -683,7 +683,7 @@ get_tmpfd (char **name) *name = NULL; else { - /* If there's an os-specific way to get an anoymous temp file use it. */ + /* If there's an os-specific way to get an anonymous temp file use it. */ fd = os_anontmp (); if (fd >= 0) return fd; diff --git a/src/remake.c b/src/remake.c index 7ba606cb..cac8e7e8 100644 --- a/src/remake.c +++ b/src/remake.c @@ -38,7 +38,7 @@ this program. If not, see <https://www.gnu.org/licenses/>. */ #include <io.h> #include <sys/stat.h> #if defined(_MSC_VER) && _MSC_VER > 1200 -/* VC7 or later supprots _stat64 to access 64-bit file size. */ +/* VC7 or later supports _stat64 to access 64-bit file size. */ #define STAT _stat64 #else #define STAT stat diff --git a/src/vmsjobs.c b/src/vmsjobs.c index 66381b8f..0a420669 100644 --- a/src/vmsjobs.c +++ b/src/vmsjobs.c @@ -1233,7 +1233,7 @@ child_execute_job (struct childbase *child, int good_stdin UNUSED, char *argv) Create a *.com file if either the command is too long for lib$spawn, or if a redirect appending to a file is desired, or - symbol substitition. + symbol substitution. */ if (vms_always_use_cmd_file || token.use_cmd_file) diff --git a/src/w32/pathstuff.c b/src/w32/pathstuff.c index 38dbc2a3..b0c5c4bd 100644 --- a/src/w32/pathstuff.c +++ b/src/w32/pathstuff.c @@ -220,7 +220,7 @@ convert_path_to_nutc(char *path) #endif pathp += strlen(pathp); - *pathp++ = ':'; /* use Unix style path separtor for new path */ + *pathp++ = ':'; /* use Unix style path separator for new path */ *pathp = '\0'; /* make sure we are null terminaed */ /* restore path separator */ diff --git a/tests/run_make_tests.com b/tests/run_make_tests.com index 89129172..c9195130 100755 --- a/tests/run_make_tests.com +++ b/tests/run_make_tests.com @@ -21,7 +21,7 @@ $! You should have received a copy of the GNU General Public License along with $! this program. If not, see <https://www.gnu.org/licenses/>. $! $! -$! Allow more than 8 paramters with using commas as a delimiter. +$! Allow more than 8 parameters with using commas as a delimiter. $! $ params = "''p1',''p2',''p3',''p4',''p5',''p6',''p7',''p8'" $! diff --git a/tests/scripts/features/implicit_search b/tests/scripts/features/implicit_search index 564dc5bb..57782c94 100644 --- a/tests/scripts/features/implicit_search +++ b/tests/scripts/features/implicit_search @@ -251,7 +251,7 @@ all: hello.tsk # One of the implicit rules has two prerequisites, hello.c and hello.x # hello.c does not qualify as ought to exit. # hello.x can be made from hello.z. -# This test exersizes the break, which prevents making hello.x as an +# This test exercises the break, which prevents making hello.x as an # intermediate from hello.z during compatibility search. unlink('hello.f'); touch('hello.z'); @@ -468,7 +468,7 @@ hello.x: flags+=good !, '-r', "true good\nhello.tsk\n"); # Intermediate prerequisite 'hello.x' has a target specific variable, a pattern -# specfic variable, matches on both rules '%.tsk: %.x' and 'big_%.tsk: %.x'. +# specific variable, matches on both rules '%.tsk: %.x' and 'big_%.tsk: %.x'. run_make_test(q! all: hello.tsk big_hello.tsk %.tsk: %.x; $(info $@) diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync index a5884cec..c6790d3b 100644 --- a/tests/scripts/features/output-sync +++ b/tests/scripts/features/output-sync @@ -368,7 +368,7 @@ unlink($fout); # SV 63333. Test that make continues to run without output sync when we # cannot create a temporary file. # Create a non-writable temporary directory. -# Run the test twice, because run_make_test cannot match a regex againt a +# Run the test twice, because run_make_test cannot match a regex against a # multiline input. my $tdir = 'test_tmp_dir'; mkdir($tdir, 0500); diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules index 0b35408d..9b0113a7 100644 --- a/tests/scripts/features/patternrules +++ b/tests/scripts/features/patternrules @@ -596,7 +596,7 @@ for my $r (@dir) { # The directory of the target in the rule definition. my $dollar = $se ? '$' : ''; # The prerequisite should only have directory if the prerequisite of 'all' has -# it and if the prequisite pattern in the rule definition does not have it. +# it and if the prerequisite pattern in the rule definition does not have it. # That is combination 2. my $pdir = $d && !$r ? $d : ''; diff --git a/tests/scripts/features/se_explicit b/tests/scripts/features/se_explicit index d1247d40..70fc65f8 100644 --- a/tests/scripts/features/se_explicit +++ b/tests/scripts/features/se_explicit @@ -320,7 +320,7 @@ hello.tsk from hello.o #MAKE#: 'hello.tsk' is up to date.\n"); # sv 62706. -# Multipe rules per target. +# Multiple rules per target. run_make_test(q! .SECONDEXPANSION: diff --git a/tests/scripts/features/statipattrules b/tests/scripts/features/statipattrules index e4e118ef..e3b00acb 100644 --- a/tests/scripts/features/statipattrules +++ b/tests/scripts/features/statipattrules @@ -182,7 +182,7 @@ for my $r (@dir) { # The directory of the prerequisite in the rule definition. my $dollar = $se ? '$' : ''; # The prerequisite should only have directory if the prerequisite of 'all' has -# it and if the prequisite pattern in the rule definition does not have it. +# it and if the prerequisite pattern in the rule definition does not have it. # That is combination 2. my $pdir = $d && !$r ? $d : ''; @@ -239,7 +239,7 @@ ${d}bye.x: $r%.x: $dollar\$(wordlist 1, 99, $dollar\$(wordlist 1, 99, %.1 %.2)) # Multiple funcs, each has multiple words, each word has multiple %, sole %, # various corner cases. -# Make should substitude the first % and only the first % in each word with the +# Make should substitute the first % and only the first % in each word with the # stem. $prereqs = "${pdir}bye1%2% ${pdir}bye 3${pdir}bye4%5 6${pdir}bye ${pdir}bye7%8 ${pdir}bye9 ${pdir}bye10% 11${pdir}bye12 13"; run_make_test(" diff --git a/tests/scripts/functions/foreach b/tests/scripts/functions/foreach index 6a06109a..27dae15a 100644 --- a/tests/scripts/functions/foreach +++ b/tests/scripts/functions/foreach @@ -5,7 +5,7 @@ $description = "Test the foreach function."; $details = "This is a test of the foreach function in gnu make. This function starts with a space separated list of -names and a variable. Each name in the list is subsituted +names and a variable. Each name in the list is substituted into the variable and the given text evaluated. The general form of the command is $(foreach var,\$list,\$text). Several types of foreach loops are tested\n"; diff --git a/tests/scripts/variables/MAKEFLAGS b/tests/scripts/variables/MAKEFLAGS index 0d0e896f..523ec8c3 100644 --- a/tests/scripts/variables/MAKEFLAGS +++ b/tests/scripts/variables/MAKEFLAGS @@ -81,7 +81,7 @@ all:; \$(info makeflags='\$(MAKEFLAGS)') } } -# Strawberry Perl's exec()--or someting!--appears to replace all /tmp with the +# Strawberry Perl's exec()--or something!--appears to replace all /tmp with the # user's %TEMP% value so we can't use that for -I testing. Make a directory. mkdir('localtmp', 0777); @@ -344,7 +344,7 @@ create_file('bye/makefile', all:; $(info $(hello))'); # sv 63347. -# Test that a cli definition takes precendence over a definition set in +# Test that a cli definition takes precedence over a definition set in # submake. run_make_test(q! v:=$(shell $(MAKE) -C bye --no-print-directory) diff --git a/tests/test_driver.pl b/tests/test_driver.pl index 26b59998..e5665bdd 100644 --- a/tests/test_driver.pl +++ b/tests/test_driver.pl @@ -836,7 +836,7 @@ sub compare_answer_vms return 1 if ($log eq $kgo); # VMS wants target device to exist or generates an error, - # Some test tagets look like VMS devices and trip this. + # Some test targets look like VMS devices and trip this. $log =~ s/^.+\: no such device or address.*$//gim; $log =~ s/\n\n/\n/gm; $log =~ s/^\n+//gm; |