diff options
Diffstat (limited to 'src/kmk/maintMakefile')
| -rw-r--r-- | src/kmk/maintMakefile | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/kmk/maintMakefile b/src/kmk/maintMakefile index 5b27cab..56eb584 100644 --- a/src/kmk/maintMakefile +++ b/src/kmk/maintMakefile @@ -147,14 +147,12 @@ do-po-update: && mkdir "$$tmppo" \ && (cd "$$tmppo" \ && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) \ - && cp "$$tmppo"/*.po po && rm -rf "$$tmppo" + && cp "$$tmppo"/*.po $(top_srcdir)/po && rm -rf "$$tmppo" cd po && $(MAKE) update-po $(MAKE) po-check po-update: - if test -d "po"; then \ - $(MAKE) do-po-update; \ - fi + [ -d "po" ] && $(MAKE) do-po-update # -------------------------- # # Updating GNU build files. # @@ -164,29 +162,30 @@ po-update: # with each of the files that belongs to some other package and is # regularly updated from the specified URL. -savannah-url = http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ +cvs-url = http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ +git-url = http://git.savannah.gnu.org/cgit target = $(patsubst get-%,%,$@) -config-url = $(savannah-url)/config/config/$(patsubst get-config/%,%,$@) +config-url = $(git-url)/config.git/plain/$(patsubst get-config/%,%,$@) get-config/config.guess get-config/config.sub: @echo $(WGET) $(config-url) -O $(target) \ && $(WGET) $(config-url) -O $(target).t \ && $(move_if_change) -gnulib-url = $(savannah-url)/gnulib/gnulib/build-aux/$(patsubst get-config/%,%,$@) +gnulib-url = $(git-url)/gnulib.git/plain/build-aux/$(patsubst get-config/%,%,$@) get-config/texinfo.tex: @echo $(WGET) $(gnulib-url) -O $(target) \ && $(WGET) $(gnulib-url) -O $(target).t \ && $(move_if_change) -gnustandards-url = $(savannah-url)/gnustandards/gnustandards/$(patsubst get-doc/%,%,$@) +gnustandards-url = $(cvs-url)/gnustandards/gnustandards/$(patsubst get-doc/%,%,$@) get-doc/make-stds.texi get-doc/fdl.texi: @echo $(WGET) $(gnustandards-url) -O $(target) \ && $(WGET) $(gnustandards-url) -O $(target).t \ && $(move_if_change) -.PHONY: cvs-update -cvs-update: get-config/texinfo.tex get-config/config.guess get-config/config.sub get-doc/make-stds.texi get-doc/fdl.texi +.PHONY: scm-update +scm-update: get-config/texinfo.tex get-config/config.guess get-config/config.sub get-doc/make-stds.texi get-doc/fdl.texi # --------------------- # @@ -194,7 +193,7 @@ cvs-update: get-config/texinfo.tex get-config/config.guess get-config/config.sub # --------------------- # .PHONY: update -update: po-update cvs-update +update: po-update scm-update ## --------------- ## @@ -208,7 +207,7 @@ local-check: po-check changelog-check # copyright-check writable-files changelog-check: - if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \ + if head $(top_srcdir)/ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \ :; \ else \ echo "$(VERSION) not in ChangeLog" 1>&2; \ @@ -250,7 +249,7 @@ distsign: $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE) %.directive.asc: % @echo "Creating directive file '$@':" @( \ - echo 'verstion: 1.1'; \ + echo 'version: 1.1'; \ echo 'directory: make'; \ echo 'filename: $*'; \ echo 'comment: Official upload of GNU make version $(VERSION)'; \ @@ -261,16 +260,18 @@ distsign: $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE) # Upload the artifacts FTPPUT = ncftpput -gnu-url = ftp-upload.gnu.org /incoming +gnu-upload-host = ftp-upload.gnu.org +gnu-upload-dir = /incoming + UPLOADS = upload-alpha upload-ftp .PHONY: $(UPLOADS) $(UPLOADS): $(DIST_ARCHIVES) $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE) - $(FTPPUT) "$(gnu-url)/$(@:upload-%=%)" $^ + $(FTPPUT) "$(gnu-upload-host)" "$(gnu-upload-dir)/$(@:upload-%=%)" $^ # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010 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 |