diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-06-05 14:06:08 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-06-05 14:07:43 +0200 |
| commit | 527187137ac6314b86246bca71cb996203b4fa10 (patch) | |
| tree | c21844210f2145922cb75739bdadbe487ae4c6d9 /djgpp | |
| parent | 398c298c8814ff5cc9c1fafc9cfaa26e331b4f79 (diff) | |
| parent | dfaac272423687b604f5eb7c801cddadc231804c (diff) | |
| download | bison-527187137ac6314b86246bca71cb996203b4fa10.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
version 2.5.1
NEWS: prepare for 2.5.1.
maint: update release procedure
maint: fix comment typos
maint: post-release administrivia
Conflicts:
NEWS
Diffstat (limited to 'djgpp')
| -rw-r--r-- | djgpp/README.in | 2 | ||||
| -rw-r--r-- | djgpp/config.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/djgpp/README.in b/djgpp/README.in index 154c8a29..60fd952a 100644 --- a/djgpp/README.in +++ b/djgpp/README.in @@ -179,7 +179,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. This will install the products into your DJGPP installation tree given by the default prefix "/dev/env/DJDIR". If you prefer to install them - into some other directory you will have to set prefix to the appropiate + into some other directory you will have to set prefix to the appropriate value: make install prefix=z:/some/other/place diff --git a/djgpp/config.bat b/djgpp/config.bat index e30c939f..ab566d70 100644 --- a/djgpp/config.bat +++ b/djgpp/config.bat @@ -471,7 +471,7 @@ redir -e /dev/null rm %XSRC%/po/stamp-cat-id Rem Update the arguments file for the configure script.
Rem We prefer without-included-gettext because libintl.a from gettext package
-Rem is the only one that is garanteed to have been ported to DJGPP.
+Rem is the only one that is guaranteed to have been ported to DJGPP.
echo --enable-nls --without-included-gettext >> args
goto ConfigurePackage
|