summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorPaul Smith <psmith@nuodb.com>2018-07-01 12:28:25 -0400
committerPaul Smith <psmith@gnu.org>2018-07-02 07:54:07 -0400
commit63b42fa235835cbeac6c1b9182f32798ea135dfd (patch)
tree69d0ded9d9a149842a889360987ab42cf6372a1f /po
parenta7b0dfddac435eab6017f99f8f5cb18860fb90ac (diff)
downloadmake-git-63b42fa235835cbeac6c1b9182f32798ea135dfd.tar.gz
Convert GNU make to use the gnulib portability library
Move content from glob/* and config/* into standard GNU directory locations lib/* and m4/*. Install the gnulib bootstrap script and its configuration file, and create a bootstrap.bat file for Windows. Update the README.git file with new requirements and instructions for building from Git. At this point we only install the alloca, getloadavg, and FDL modules from gnulib. We keep our old glob/fnmatch implementation since the gnulib versions require significant amounts of infrastructure which doesn't exist on Windows yet. Further work is required here. Due to a problem with gnulib's version of getloadavg, we need to bump the minimum required version of automake to 1.16.1 unfortunately. * README.git: Update instructions * NEWS: Move developer news to a separate section * configure.ac: Update for use with gnulib modules * bootstrap: Bootstrap from Git workspace (import from gnulib) * bootstrap.conf: Bootstrap configuration for GNU make * bootstrap.bat: Bootstrap from Git workspace for Windows * gl/modules/make-glob: Support our local fnmatch/glob implementation * config/acinclude.m4: Move to m4/ * config/dospaths.m4: Move to m4/ * glob/fnmatch.c: Move to lib/ * glob/fnmatch.h.in: Move to lib/ * glob/glob.c: Move to lib/ * glob/glob.h.in: Move to lib/ * Makefile.am: Update for new directories * build.template: Update for new directories * build_w32.bat: Update for new directories * builddos.bat: Update for new directories * maintMakefile: Update for new directories * makefile.com: Update for new directories * mk/Amiga.mk: Update for new directories * mk/Posix.mk.in: Update for new directories * mk/VMS.mk: Update for new directories * mk/Windows32.mk: Update for new directories * mk/msdosdjgpp.mk: Update for new directories * po/LINGUAS: One language per line (needed by gnulib) * INSTALL: Remove (obtained from gnulib) * src/alloca.c: Remove (obtained from gnulib) * src/getloadavg.c: Remove (obtained from gnulib) * po/Makevars: Remove (created by bootstrap) * config/*: Remove leftover files * glob/*: Remove leftover files
Diffstat (limited to 'po')
-rw-r--r--po/.gitignore19
-rw-r--r--po/LINGUAS32
-rw-r--r--po/Makevars65
3 files changed, 31 insertions, 85 deletions
diff --git a/po/.gitignore b/po/.gitignore
index d7261f59..df669c5d 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,15 +1,4 @@
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-make.pot
-quot.sed
-remove-potcdate.sin
-remove-potcdate.sed
-stamp-po
-*.gmo
-*.po
+*
+!.gitignore
+!LINGUAS
+!POTFILES.in
diff --git a/po/LINGUAS b/po/LINGUAS
index 6e9eb56d..3b67c0d3 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,5 +1,27 @@
-# Set of available languages: 27 languages
-
-be cs da de es fi fr ga gl he hr id it ja ko lt nl pl pt_BR ru sr sv tr uk vi zh_CN zh_TW
-
-# Can't seem to get en@quot and en@boldquot to build properly?
+be
+cs
+da
+de
+es
+fi
+fr
+ga
+gl
+he
+hr
+id
+it
+ja
+ko
+lt
+nl
+pl
+pt_BR
+ru
+sr
+sv
+tr
+uk
+vi
+zh_CN
+zh_TW
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index c1cfdbc9..00000000
--- a/po/Makevars
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a -*-Makefile-*-
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
-# This file is part of GNU Make.
-#
-# GNU Make is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-# Ensure that all our magical output macros are correctly marked as
-# C (printf) format strings.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
- --flag=DB:2:c-format --flag=DBF:2:c-format --flag=DBS:2:c-format \
- --flag=O:3:c-format --flag=OSN:3:c-format --flag=ONS:3:c-format \
- --flag=OS:3:c-format --flag=OSS:3:c-format --flag=OSSS:3:c-format \
- --flag=ON:3:c-format --flag=ONN:3:c-format
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
-# package. (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.) Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright. The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-# in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-# understood.
-# - Strings which make invalid assumptions about notation of date, time or
-# money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = bug-make@gnu.org
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used. It is usually empty.
-EXTRA_LOCALE_CATEGORIES =