diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | ChangeLog.2 | 2 | ||||
| -rw-r--r-- | README.Amiga | 12 | ||||
| -rw-r--r-- | TODO.private | 2 | ||||
| -rw-r--r-- | function.c | 2 | ||||
| -rw-r--r-- | glob/glob.h | 2 | ||||
| -rw-r--r-- | job.c | 2 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | readme.vms | 2 | ||||
| -rw-r--r-- | remake.c | 2 | ||||
| -rw-r--r-- | signame.c | 8 | ||||
| -rw-r--r-- | tests/ChangeLog | 10 | ||||
| -rw-r--r-- | tests/NEWS | 2 | ||||
| -rw-r--r-- | tests/README | 4 | ||||
| -rw-r--r-- | tests/scripts/variables/private | 2 | ||||
| -rw-r--r-- | vmsdir.h | 2 |
16 files changed, 53 insertions, 29 deletions
@@ -126,6 +126,30 @@ * config.h.W32.template: Likewise. * configh.dos.template: Likewise. +2013-04-30 Stefano Lattarini <stefano.lattarini@gmail.com> (tiny change) + + cosmetics: fix few innocuous typos + + Most of these were found using Lucas De Marchi's 'codespell' tool. + + * ChangeLog: Fix minor typos. + * ChangeLog.2: Likewise. + * README.Amiga: Likewise. + * TODO.private: Likewise. + * function.c: Likewise. + * glob/glob.h: Likewise. + * job.c: Likewise. + * main.c: Likewise. + * readme.vms: Likewise. + * remake.c: Likewise. + * tests/ChangeLog: Likewise. + * tests/NEWS: Likewise. + * tests/README: Likewise. + * tests/scripts/variables/private: Likewise. + * vmsdir.h: Likewise. + * signame.c: Likewise. While at it, improve line wrapping in the + touched comment. + 2013-04-29 Eli Zaretskii <eliz@gnu.org> * w32/include/dlfcn.h: New file. diff --git a/ChangeLog.2 b/ChangeLog.2 index 1705b76..0816454 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -3080,7 +3080,7 @@ Sun May 12 19:19:43 1996 Aaron Digulla <digulla@fh-konstanz.de> * main.c: (main), variable.c Changed handling of ENV-vars. Make stores now the names of the variables only and reads their contents when they are accessed to reflect that these variables are really - global (ie. they CAN change WHILE make runs !) This handling is + global (i.e., they CAN change WHILE make runs !) This handling is made in lookup_variable() * Makefile.ami: renamed file.h to filedep.h diff --git a/README.Amiga b/README.Amiga index aa82251..fa18814 100644 --- a/README.Amiga +++ b/README.Amiga @@ -25,8 +25,8 @@ GNU make): endif @@\ $(CC) Link Make.o To make - works. Note that the @@ must stand alone (ie. "make@@\" is illegal). - Also be carefull that there is a space after the "\" (ie, at the + works. Note that the @@ must stand alone (i.e., "make@@\" is illegal). + Also be careful that there is a space after the "\" (i.e., at the beginning of the next line). - Can be made resident to save space and time - Amiga specific wildcards can be used in $(wildcard ...) @@ -36,17 +36,17 @@ BUGS: dummy.h : src/*.c -tries to make dummy.h from "src/*.c" (ie. no wildcard-expansion takes +tries to make dummy.h from "src/*.c" (i.e., no wildcard-expansion takes place). You have to use "$(wildcard src/*.c)" instead. COMPILING FROM SCRATCH ---------------------- -To recompile, you need SAS/C 6.51. make itself is not neccessary, there +To recompile, you need SAS/C 6.51. make itself is not necessary, there is an smakefile. 1. Copy config.ami to config.h -2. If you use make to compie, copy Makefile.ami to Makefile and +2. If you use make to compile, copy Makefile.ami to Makefile and glob/Makefile.ami to glob/Makefile. Copy make into the current directory. @@ -54,7 +54,7 @@ is an smakefile. INSTALLATION -Copy make somewhere in your search path (eg. sc:c or sc:bin). +Copy make somewhere in your search path (e.g., sc:c or sc:bin). If you plan to use recursive makes, install make resident: Resident make Add diff --git a/TODO.private b/TODO.private index c3dda97..abb7410 100644 --- a/TODO.private +++ b/TODO.private @@ -6,7 +6,7 @@ This list comes both from the authors and from users of GNU make. They are listed in no particular order! -Also, I don't gaurantee that all of them will be ultimately deemed "good +Also, I don't guarantee that all of them will be ultimately deemed "good ideas" and implemented. These are just the ones that, at first blush, seem to have some merit (and that I can remember). @@ -1924,7 +1924,7 @@ func_shell (char *o, char **argv, const char *funcname UNUSED) #ifdef EXPERIMENTAL /* - equality. Return is string-boolean, ie, the empty string is false. + equality. Return is string-boolean, i.e., the empty string is false. */ static char * func_eq (char *o, char **argv, char *funcname UNUSED) diff --git a/glob/glob.h b/glob/glob.h index a613aff..0992de3 100644 --- a/glob/glob.h +++ b/glob/glob.h @@ -56,7 +56,7 @@ typedef __SIZE_TYPE__ __size_t; # else /* This is a guess. */ /*hb - * Conflicts with DECCs aready defined type __size_t. + * Conflicts with DECCs already defined type __size_t. * Defining an own type with a name beginning with '__' is no good. * Anyway if DECC is used and __SIZE_T is defined then __size_t is * already defined (and I hope it's exactly the one we need here). @@ -2182,7 +2182,7 @@ new_job (struct file *file) reap_children (0, 0); /* Kick off any jobs we have waiting for an opportunity that - can run now (ie waiting for load). */ + can run now (i.e., waiting for load). */ start_waiting_jobs (); /* If our "free" slot has become available, use it; we don't need an @@ -825,7 +825,7 @@ handle_runtime_exceptions( struct _EXCEPTION_POINTERS *exinfo ) /* * On WIN32 systems we don't have the luxury of a /bin directory that * is mapped globally to every drive mounted to the system. Since make could - * be invoked from any drive, and we don't want to propogate /bin/sh + * be invoked from any drive, and we don't want to propagate /bin/sh * to every single drive. Allow ourselves a chance to search for * a value for default shell here (if the default path does not exist). */ @@ -1272,7 +1272,7 @@ main (int argc, char **argv, char **envp) } #ifdef WINDOWS32 /* If we didn't find a correctly spelled PATH we define PATH as - * either the first mispelled value or an empty string + * either the first misspelled value or an empty string */ if (!unix_path) define_variable_cname ("PATH", windows32_path ? windows32_path : "", @@ -353,7 +353,7 @@ replaced it with a hack in vmsfunctions.c. I will provide a full rewrite somewhere in the future. Be warned, the time resolution inside make is less than what vms provides. This might be a problem on the faster Alphas. -You can use a : in a filename only if you preceed it with a backslash ('\'). +You can use a : in a filename only if you precede it with a backslash ('\'). E.g.- hobbes\:[bogas.files] Make ignores success, informational, or warning errors (-S-, -I-, or @@ -41,7 +41,7 @@ extern int try_implicit_rule (struct file *file, unsigned int depth); /* The test for circular dependencies is based on the 'updating' bit in - 'struct file'. However, double colon targets have seperate 'struct + 'struct file'. However, double colon targets have separate 'struct file's; make sure we always use the base of the double colon chain. */ #define start_updating(_f) (((_f)->double_colon ? (_f)->double_colon : (_f))\ @@ -192,10 +192,10 @@ signame_init (void) init_sig (SIGURG, "URG", _("Urgent I/O condition")); #endif #if defined (SIGIO) - /* "I/O pending" has also been suggested. A disadvantage is - that signal only happens when the process has - asked for it, not everytime I/O is pending. Another disadvantage - is the confusion from giving it a different name than under Unix. */ + /* "I/O pending" has also been suggested. A disadvantage is that signal + only happens when the process has asked for it, not every time I/O is + pending. Another disadvantage is the confusion from giving it a + different name than under Unix. */ init_sig (SIGIO, "IO", _("I/O possible")); #endif #if defined (SIGWIND) diff --git a/tests/ChangeLog b/tests/ChangeLog index d98e938..260093a 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -512,7 +512,7 @@ * test_driver.pl (toplevel): Skip all hidden files/directories (ones beginning with "."). - * scripts/functions/andor: Tests for $(and ..) and $(or ...) + * scripts/functions/andor: Tests for $(and ...) and $(or ...) functions. 2006-02-08 Boris Kolpackov <boris@kolpackov.net> @@ -599,9 +599,9 @@ 2005-08-13 Boris Kolpackov <boris@kolpackov.net> - * scripts/functions/wildcard: Wrap calls to $(wildcard ) with + * scripts/functions/wildcard: Wrap calls to $(wildcard) with $(sort) so that the resulting order is no longer filesystem- - dependant. + dependent. 2005-08-10 Boris Kolpackov <boris@kolpackov.net> @@ -672,7 +672,7 @@ 2005-06-09 Paul D. Smith <psmith@gnu.org> - * scripts/functions/foreach: Add a test for Savannah bug #11913. + * scripts/functions/foreach: Add a test for Savannah bug #11913. 2005-05-31 Boris Kolpackov <boris@kolpackov.net> @@ -692,7 +692,7 @@ 2005-05-02 Paul D. Smith <psmith@gnu.org> * scripts/features/parallelism: Add a test for exporting recursive - variables containing $(shell ) calls. Rewrite this script to use + variables containing $(shell) calls. Rewrite this script to use run_make_test() everywhere. 2005-04-07 Paul D. Smith <psmith@gnu.org> @@ -72,7 +72,7 @@ Changes from 0.4.4 to 0.4.5 (April 29, 1995): Also, some tests and stuff still haven't made it in because I haven't had time to write the test scripts for them. But they, - too, will get in eventually. Contributions of scripts (ie, tests + too, will get in eventually. Contributions of scripts (i.e., tests that I can just drop in) are particularly welcome and will be incorporated immediately. diff --git a/tests/README b/tests/README index 6db4816..e604f3e 100644 --- a/tests/README +++ b/tests/README @@ -38,7 +38,7 @@ To run the test suite on Windows NT or DOS systems, use "perl.exe ./run_make-tests.pl". By default, the test engine picks up the first executable called "make" -that it finds in your path. You may use the -make_path option (ie, +that it finds in your path. You may use the -make_path option (i.e., "perl run_make_tests -make_path /usr/local/src/make-3.78/make") if you want to run a particular copy. This now works correctly with relative paths and when make is called something other than "make" (like @@ -58,7 +58,7 @@ The options/dash-l test will not really test anything if the copy of make you are using can't obtain the system load. Some systems require make to be setgid sys or kmem for this; if you don't want to install make just to test it, make it setgid to kmem or whatever group /dev/kmem -is (ie, "chgrp kmem make;chmod g+s make" as root). In any case, the +is (i.e., "chgrp kmem make;chmod g+s make" as root). In any case, the options/dash-l test should no longer *fail* because make can't read /dev/kmem. diff --git a/tests/scripts/variables/private b/tests/scripts/variables/private index 012274e..8967ffb 100644 --- a/tests/scripts/variables/private +++ b/tests/scripts/variables/private @@ -75,7 +75,7 @@ a b: ; @echo $@=$(private) ', '', "b=a\na=a\n"); -# 9: make sure private suppresses inheritence +# 9: make sure private suppresses inheritance run_make_test(q! DEFS = FOO all: bar1 @@ -44,7 +44,7 @@ struct direct + ((dp)->d_namlen+1)) \ + 3) & ~3) -#define d_ino d_fileno /* compatability */ +#define d_ino d_fileno /* compatibility */ /* |