diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2010-10-08 11:10:06 -0700 |
---|---|---|
committer | Joel E. Denny <joeldenny@joeldenny.org> | 2010-10-16 18:10:48 -0400 |
commit | 86996fca101c629ef197313a1058df26e01df950 (patch) | |
tree | ac606d0913d93865c31a8f944c6949121476c4cb /po | |
parent | 32dc877a20aba67d3df6bf9dafdb75850073733c (diff) | |
download | bison-86996fca101c629ef197313a1058df26e01df950.tar.gz |
Adjust to recent changes to gnulib bootstrap.
* .cvsignore, build-aux/.cvsignore, doc/.cvsignore, etc/.cvsignore:
* examples/calc++/.cvsignore, lib/.cvsignore, m4/.cvsignore:
* po/.cvsignore, runtime-po/.cvsignore, src/.cvsignore:
* tests/.cvsignore: Remove; I don't use CVS to maintain Bison
anymore and don't know of anybody else who does. If someone needs
these files, they can resurrect them.
* .gitignore, build-aux/.gitignore, doc/.gitignore, lib/.gitignore:
* m4/.gitignore, po/.gitignore, runtime-po/.gitignore:
Omit leading '/', since bootstrap omits it.
Adjust file names to match current contents better.
* bootstrap: Sync from gnulib: this contains the new gnulib_mk_hook
installed just for us.
* bootstrap.conf (excluded_files): Don't exclude codeset.m4,
glibc21.m4, inttypes_h.m4, size_max.m4, xsize.m4, as they are now
needed somehow. Don't have time to look into why.
(gnulib_modules): Change malloc to malloc-gnu. Do we really assume
the GNU malloc behavior, where malloc (0) != NULL unless we're
out of storage? If not, we can omit malloc-gnu; but for now I left
it in to be safe.
(vc_ignore): Remove.
* README-hacking: Renamed from HACKING, since gnulib bootstrap now
uses that convention.
(cherry picked from commit 95aed8db15a0bb0f7819bf77586d0cf6812ffdfd)
Conflicts:
bootstrap
build-aux/.cvsignore
build-aux/.gitignore
doc/.cvsignore
doc/.gitignore
etc/.cvsignore
m4/.cvsignore
m4/.gitignore
src/.cvsignore
src/.gitignore
tests/.cvsignore
Diffstat (limited to 'po')
-rw-r--r-- | po/.cvsignore | 22 | ||||
-rw-r--r-- | po/.gitignore | 44 |
2 files changed, 22 insertions, 44 deletions
diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index db44d74e..00000000 --- a/po/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -*.gmo -*.po -*.po~ -.reference -LINGUAS -Makefile -Makefile.in -Makefile.in.in -Makevars -Makevars.template -POTFILES -Rules-quot -bison.pot -boldquot.sed -en@boldquot.header -en@quot.header -insert-header.sed -insert-header.sin -quot.sed -remove-potcdate.sed -remove-potcdate.sin -stamp-po diff --git a/po/.gitignore b/po/.gitignore index 79594c04..db44d74e 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1,22 +1,22 @@ -/*.gmo -/*.po -/*.po~ -/.reference -/LINGUAS -/Makefile -/Makefile.in -/Makefile.in.in -/Makevars -/Makevars.template -/POTFILES -/Rules-quot -/bison.pot -/boldquot.sed -/en@boldquot.header -/en@quot.header -/insert-header.sed -/insert-header.sin -/quot.sed -/remove-potcdate.sed -/remove-potcdate.sin -/stamp-po +*.gmo +*.po +*.po~ +.reference +LINGUAS +Makefile +Makefile.in +Makefile.in.in +Makevars +Makevars.template +POTFILES +Rules-quot +bison.pot +boldquot.sed +en@boldquot.header +en@quot.header +insert-header.sed +insert-header.sin +quot.sed +remove-potcdate.sed +remove-potcdate.sin +stamp-po |