summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--NEWS5
-rw-r--r--config/Makefile.am7
-rw-r--r--configure.in7
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/make.texi2
-rw-r--r--glob/Makefile.am2
-rw-r--r--po/Makevars16
8 files changed, 37 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 06d2df17..9e05683c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
# This is a -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.7.3 dist-bzip2 check-news ansi2knr
+AUTOMAKE_OPTIONS = dist-bzip2 check-news ansi2knr
ACLOCAL_AMFLAGS = -I config
SUBDIRS = glob config po doc
@@ -61,6 +61,13 @@ html:
localedir = $(datadir)/locale
+# We need this due to a bug in gettext 0.12.1 Makefile.in.in: without this I
+# can't run distcheck because this file is created but not removed during
+# distclean.
+
+distclean-local:
+ test "$(srcdir)" = . || rm -f po/stamp-po
+
# --------------- Local INSTALL Section
# If necessary, change the gid of the app and turn on the setgid flag.
diff --git a/NEWS b/NEWS
index a93fc4e1..2a3ff8f0 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Please send GNU make bug reports to <bug-make@gnu.org>.
See the README file and the GNU make manual for details on sending bug
reports.
-Version 3.81a2
+Version 3.81rc1
* GNU make is ported to OS/2.
Port provided by Andreas Buening <andreas.buening@nexgo.de>.
@@ -29,6 +29,9 @@ Version 3.81a2
* Enhancements for POSIX compatibility:
- Only touch targets (under -t) if they have at least one command.
+* Updated to autoconf 2.57, automake 1.7.6, and gettext 0.12.1. Users
+ should not be impacted.
+
Version 3.80
diff --git a/config/Makefile.am b/config/Makefile.am
index 0a4e3c7e..8295408b 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,8 +1,7 @@
# -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.7.3
-
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
+EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 nls.m4 \
intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 \
isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
- progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+ progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 \
+ dospaths.m4 po.m4
diff --git a/configure.in b/configure.in
index ef44f904..e7b31b18 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([GNU make],[3.81a2],[bug-make@gnu.org])
+AC_INIT([GNU make],[3.81rc1],[bug-make@gnu.org])
AC_PREREQ(2.57)
@@ -12,8 +12,7 @@ AC_CONFIG_SRCDIR(vpath.c)
AC_CONFIG_HEADERS(config.h)
# Automake setup
-AM_INIT_AUTOMAKE
-AC_PROG_MAKE_SET
+AM_INIT_AUTOMAKE([1.7.6])
# Checks for programs.
AC_PROG_CC
@@ -35,7 +34,7 @@ AM_C_PROTOTYPES
# Enable gettext, in "external" mode.
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.12.1)
AM_GNU_GETTEXT([external])
# This test must come as early as possible after the compiler configuration
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0c130b2d..ba7eef34 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
# -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.7.3
-
TEXI2HTML = texi2html
TEXI2HTML_FLAGS = -split_chapter
diff --git a/doc/make.texi b/doc/make.texi
index 5184c164..5aef5c80 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -4184,10 +4184,12 @@ from getting implicit commands (from implicit rules or the
@c !!! another reason is for canonical stamp files:
@ignore
+@example
foo: stamp-foo ;
stamp-foo: foo.in
create foo frm foo.in
touch $@
+@end example
@end ignore
You may be inclined to define empty command strings for targets that are
diff --git a/glob/Makefile.am b/glob/Makefile.am
index b777015a..d38528da 100644
--- a/glob/Makefile.am
+++ b/glob/Makefile.am
@@ -1,6 +1,6 @@
# -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.7.3 foreign
+AUTOMAKE_OPTIONS = foreign
# Only build the library when the system doesn't already have GNU glob.
if USE_LOCAL_GLOB
diff --git a/po/Makevars b/po/Makevars
index 8b09f53b..1072d3ea 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,6 +20,22 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# 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 =