Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/maintMakefile

    r2421 r2591  
    148148          && (cd "$$tmppo" \
    149149                && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) \
    150           && cp "$$tmppo"/*.po po && rm -rf "$$tmppo"
     150          && cp "$$tmppo"/*.po $(top_srcdir)/po && rm -rf "$$tmppo"
    151151        cd po && $(MAKE) update-po
    152152        $(MAKE) po-check
    153153
    154154po-update:
    155         if test -d "po"; then \
    156           $(MAKE) do-po-update; \
    157         fi
     155        [ -d "po" ] && $(MAKE) do-po-update
    158156
    159157# -------------------------- #
    … …  
    165163# regularly updated from the specified URL.
    166164
    167 savannah-url = http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
     165cvs-url = http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
     166git-url = http://git.savannah.gnu.org/cgit
    168167target = $(patsubst get-%,%,$@)
    169168
    170 config-url = $(savannah-url)/config/config/$(patsubst get-config/%,%,$@)
     169config-url = $(git-url)/config.git/plain/$(patsubst get-config/%,%,$@)
    171170get-config/config.guess get-config/config.sub:
    172171        @echo $(WGET) $(config-url) -O $(target) \
    … …  
    174173          && $(move_if_change)
    175174
    176 gnulib-url = $(savannah-url)/gnulib/gnulib/build-aux/$(patsubst get-config/%,%,$@)
     175gnulib-url = $(git-url)/gnulib.git/plain/build-aux/$(patsubst get-config/%,%,$@)
    177176get-config/texinfo.tex:
    178177        @echo $(WGET) $(gnulib-url) -O $(target) \
    … …  
    180179          && $(move_if_change)
    181180
    182 gnustandards-url = $(savannah-url)/gnustandards/gnustandards/$(patsubst get-doc/%,%,$@)
     181gnustandards-url = $(cvs-url)/gnustandards/gnustandards/$(patsubst get-doc/%,%,$@)
    183182get-doc/make-stds.texi get-doc/fdl.texi:
    184183        @echo $(WGET) $(gnustandards-url) -O $(target) \
    … …  
    186185          && $(move_if_change)
    187186
    188 .PHONY: cvs-update
    189 cvs-update: get-config/texinfo.tex get-config/config.guess get-config/config.sub get-doc/make-stds.texi get-doc/fdl.texi
     187.PHONY: scm-update
     188scm-update: get-config/texinfo.tex get-config/config.guess get-config/config.sub get-doc/make-stds.texi get-doc/fdl.texi
    190189
    191190
    … …  
    195194
    196195.PHONY: update
    197 update: po-update cvs-update
     196update: po-update scm-update
    198197
    199198
    … …  
    209208
    210209changelog-check:
    211         if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
     210        if head $(top_srcdir)/ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
    212211          :; \
    213212        else \
    … …  
    251250        @echo "Creating directive file '$@':"
    252251        @( \
    253            echo 'verstion: 1.1'; \
     252           echo 'version: 1.1'; \
    254253           echo 'directory: make'; \
    255254           echo 'filename: $*'; \
    … …  
    262261
    263262FTPPUT = ncftpput
    264 gnu-url = ftp-upload.gnu.org /incoming
     263gnu-upload-host = ftp-upload.gnu.org
     264gnu-upload-dir  = /incoming
     265
    265266
    266267UPLOADS = upload-alpha upload-ftp
    267268.PHONY: $(UPLOADS)
    268269$(UPLOADS): $(DIST_ARCHIVES) $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE)
    269         $(FTPPUT) "$(gnu-url)/$(@:upload-%=%)" $^
     270        $(FTPPUT) "$(gnu-upload-host)" "$(gnu-upload-dir)/$(@:upload-%=%)" $^
    270271
    271272
    272273# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    273 # 2007 Free Software Foundation, Inc.
     274# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    274275# This file is part of GNU Make.
    275276#
Note: See TracChangeset for help on using the changeset viewer.