mirror of
https://github.com/mirror/make.git
synced 2025-04-24 03:50:34 +08:00
Updated for autoconf 2.57, automake 1.7.6, and gettext 0.12.1.
Fixed problems with the dist target (adding missing files). Workaround for a bug in gettext 0.12.1 po/Makefile.in.in where distclean wasn't cleaning everything, which caused distcheck to fail.
This commit is contained in:
parent
e3986eea43
commit
db401d8e0a
@ -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.
|
||||
|
5
NEWS
5
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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,7 +1,5 @@
|
||||
# -*-Makefile-*-, or close enough
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.7.3
|
||||
|
||||
TEXI2HTML = texi2html
|
||||
TEXI2HTML_FLAGS = -split_chapter
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
16
po/Makevars
16
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 =
|
||||
|
Loading…
Reference in New Issue
Block a user