From 74216b00a461e6002640cf98c66f5c137e84470b Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 22 Oct 2003 04:35:27 +0000 Subject: [PATCH] Build fixes due to changes in the FSF web site. Add new language support. Minor configure, etc. cleanups. --- ChangeLog | 32 +++++++++++++++++++++++++++++++- ChangeLog.2 | 15 --------------- Makefile.am | 2 +- README.cvs | 3 +++ doc/make.texi | 8 ++++---- main.c | 8 ++++---- maintMakefile | 19 ++++++++++++------- po/ChangeLog | 4 ++++ po/LINGUAS | 2 +- 9 files changed, 60 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67a21f22..6f4ac90f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-10-21 Paul D. Smith + + * main.c (log_working_directory): Add newlines to printf()s. + + * README.cvs: Add a note to ignore warnings during autoreconf. + + * maintMakefile (po_repo): Set a new URL for PO file updates. + (get-config/config.guess get-config/config.sub): Get these files + from the Savannah config project instead of ftp.gnu.org. + 2003-07-18 Paul D. Smith * dir.c (directory_contents_hash_1, directory_contents_hash_1) @@ -1131,5 +1141,25 @@ * make.texinfo, NEWS, TODO.private: Minor spelling corrections. Ran spell-check on make.texinfo. +2000-06-23 Paul D. Smith + + * main.c (main): Replace EXIT_SUCCESS, EXIT_FAILURE, and + EXIT_TROUBLE with MAKE_SUCCESS, MAKE_FAILURE, and MAKE_TROUBLE. + * make.h: Define these macros. + + * Version 3.79.1 released. + + * configure.in: Add a new option, --disable-nsec-timestamps, to + avoid using sub-second timestamps on systems that support it. It + can lead to problems, e.g. if your makefile relies on "cp -p". + * README.template: Document the issue with "cp -p". + + * config.guess, config.sub: Updated. + -See ChangeLog.2 for earlier changes. + +See ChangeLog.2, available in the CVS repository at: + + http://savannah.gnu.org/cvs/?group=make + +for earlier changes. diff --git a/ChangeLog.2 b/ChangeLog.2 index d30cfa42..49601e2a 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,18 +1,3 @@ -2000-06-23 Paul D. Smith - - * main.c (main): Replace EXIT_SUCCESS, EXIT_FAILURE, and - EXIT_TROUBLE with MAKE_SUCCESS, MAKE_FAILURE, and MAKE_TROUBLE. - * make.h: Define these macros. - - * Version 3.79.1 released. - - * configure.in: Add a new option, --disable-nsec-timestamps, to - avoid using sub-second timestamps on systems that support it. It - can lead to problems, e.g. if your makefile relies on "cp -p". - * README.template: Document the issue with "cp -p". - - * config.guess, config.sub: Updated. - 2000-06-22 Paul D. Smith * job.c (start_job_command): Increment commands_started before the diff --git a/Makefile.am b/Makefile.am index 9e05683c..322f52a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # This is a -*-Makefile-*-, or close enough -AUTOMAKE_OPTIONS = dist-bzip2 check-news ansi2knr +AUTOMAKE_OPTIONS = 1.7.6 dist-bzip2 check-news ansi2knr ACLOCAL_AMFLAGS = -I config SUBDIRS = glob config po doc diff --git a/README.cvs b/README.cvs index 8fa4feb7..fc9cdd68 100644 --- a/README.cvs +++ b/README.cvs @@ -37,6 +37,9 @@ to the point where you can run "make". This rebuilds all the things that need rebuilding, installing missing files as symbolic links. + You may get warnings here about missing files like README, etc. + Ignore them, they are harmless. + 2) $ ./configure diff --git a/doc/make.texi b/doc/make.texi index 5aef5c80..e2b3dd66 100644 --- a/doc/make.texi +++ b/doc/make.texi @@ -969,10 +969,10 @@ length in later chapters.@refill @cindex explicit rule, definition of @item An @dfn{explicit rule} says when and how to remake one or more files, -called the rule's targets. It lists the other files that the targets -depend on, call the @dfn{prerequisites} of the target, and may also give -commands to use to create or update the targets. @xref{Rules, ,Writing -Rules}. +called the rule's @dfn{targets}. It lists the other files that the +targets depend on, called the @dfn{prerequisites} of the target, and +may also give commands to use to create or update the targets. +@xref{Rules, ,Writing Rules}. @cindex rule, implicit, definition of @cindex implicit rule, definition of diff --git a/main.c b/main.c index 8a1f267d..5a6e924c 100644 --- a/main.c +++ b/main.c @@ -2802,9 +2802,9 @@ log_working_directory (int entering) if (makelevel == 0) if (starting_directory == 0) if (entering) - printf (_("%s: Entering an unknown directory"), program); + printf (_("%s: Entering an unknown directory\n"), program); else - printf (_("%s: Leaving an unknown directory"), program); + printf (_("%s: Leaving an unknown directory\n"), program); else if (entering) printf (_("%s: Entering directory `%s'\n"), @@ -2815,10 +2815,10 @@ log_working_directory (int entering) else if (starting_directory == 0) if (entering) - printf (_("%s[%u]: Entering an unknown directory"), + printf (_("%s[%u]: Entering an unknown directory\n"), program, makelevel); else - printf (_("%s[%u]: Leaving an unknown directory"), + printf (_("%s[%u]: Leaving an unknown directory\n"), program, makelevel); else if (entering) diff --git a/maintMakefile b/maintMakefile index 1c934636..796a221e 100644 --- a/maintMakefile +++ b/maintMakefile @@ -118,7 +118,7 @@ move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \ # Updating PO files. # # ------------------- # -po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE) +po_repo = http://www2.iro.umontreal.ca/%7Egnutra/po/maint/$(PACKAGE) .PHONY: do-po-update po-update do-po-update: tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\ @@ -144,15 +144,11 @@ po-update: # $(srcdir)/src/ansi2knr.c -wget_files ?= $(srcdir)/config/config.guess $(srcdir)/config/config.sub \ - $(srcdir)/doc/texinfo.tex $(srcdir)/doc/make-stds.texi \ +wget_files ?= $(srcdir)/doc/texinfo.tex $(srcdir)/doc/make-stds.texi \ $(srcdir)/doc/fdl.texi wget-targets = $(patsubst %, get-%, $(wget_files)) -config.guess-url_prefix = $(ftp-gnu)/config/ -config.sub-url_prefix = $(ftp-gnu)/config/ - ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/ texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/ @@ -170,12 +166,21 @@ $(wget-targets): && $(WGET) $(url) -O $(target).t \ && $(move_if_change) +config-prefix = http://savannah.gnu.org/cgi-bin/viewcvs/config +config-url = $(config-prefix)/$(patsubst get-%,%,$@)?rev=HEAD +get-config/config.guess get-config/config.sub: + @echo $(WGET) $(config-url) -O $(target) \ + && $(WGET) $(config-url) -O $(target).t \ + && $(move_if_change) + + .PHONY: wget-update wget-update: $(wget-targets) # Updating tools via CVS. cvs_files ?= depcomp missing +# config/config.guess config/config.sub cvs-targets = $(patsubst %, get-%, $(cvs_files)) automake_repo = :pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake @@ -186,7 +191,7 @@ $(cvs-targets): && $(move_if_change) .PHONY: cvs-update -cvs-update: $(cvs-targets) +cvs-update: $(cvs-targets) get-config/config.guess get-config/config.sub # --------------------- # diff --git a/po/ChangeLog b/po/ChangeLog index 265fa438..9d83d219 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2003-10-18 Paul D. Smith + + * LINGUAS: Added a new translation for Belarusian (be). + 2002-12-19 Paul D. Smith * LINGUAS: Added a new translation for Ukrainian (uk). diff --git a/po/LINGUAS b/po/LINGUAS index f2217f3c..92423dd1 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,5 +1,5 @@ # Set of available languages: 16 languages -da de es fr gl he hr ja ko nl pl pt_BR sv ru tr uk zh_CN +be da de es fr gl he hr ja ko nl pl pt_BR sv ru tr uk zh_CN # Can't seem to get en@quot and en@boldquot to build properly?